diff --git a/hash/z80ne_flop.xml b/hash/z80ne_flop.xml
index 3074e3b8c2d..d4eb84aff10 100644
--- a/hash/z80ne_flop.xml
+++ b/hash/z80ne_flop.xml
@@ -157,9 +157,9 @@ Thanks to http://z80ne.com for info!
 	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 @@ Thanks to http://z80ne.com for info!
 	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 @@ Thanks to http://z80ne.com for info!
 	</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 --git a/src/mame/drivers/z80ne.cpp b/src/mame/drivers/z80ne.cpp
index e1da99443f1..00da29c4226 100644
--- a/src/mame/drivers/z80ne.cpp
+++ b/src/mame/drivers/z80ne.cpp
@@ -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 @@ void z80netb_state::main_mem(address_map &map)
 	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 @@ void z80ne_state::main_io(address_map &map)
 	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 @@ void z80net_state::main_io(address_map &map)
 	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 @@ static INPUT_PORTS_START( z80ne )
 	 * 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 @@ static INPUT_PORTS_START( z80ne )
 	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 @@ static INPUT_PORTS_START( z80net )
 
 	/* 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 @@ void z80ne_state::z80ne(machine_config &config)
 {
 	/* 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 @@ void z80ne_state::z80ne(machine_config &config)
 
 	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 @@ void z80net_state::z80net(machine_config &config)
 {
 	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 @@ void z80net_state::z80net(machine_config &config)
 
 	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 @@ void z80netb_state::z80netb(machine_config &config)
 {
 	/* 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 @@ void z80netb_state::z80netb(machine_config &config)
 
 	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 @@ void z80netf_state::z80netf(machine_config &config)
 	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 @@ void z80netf_state::z80netf(machine_config &config)
 
 
 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_START( z80netb )
 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) )
+	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 - 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) )
+	/* 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 --git a/src/mame/includes/z80ne.h b/src/mame/includes/z80ne.h
index 4309dee6fac..52aaa567bd8 100644
--- a/src/mame/includes/z80ne.h
+++ b/src/mame/includes/z80ne.h
@@ -69,11 +69,10 @@ public:
 		: 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 @@ public:
 		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 @@ protected:
 
 	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 @@ protected:
 	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 @@ public:
 
 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 @@ protected:
 
 	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 @@ public:
 
 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 @@ private:
 		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 --git a/src/mame/machine/z80ne.cpp b/src/mame/machine/z80ne.cpp
index fb2087d02e3..af61fde4a04 100644
--- a/src/mame/machine/z80ne.cpp
+++ b/src/mame/machine/z80ne.cpp
@@ -65,38 +65,38 @@ TIMER_CALLBACK_MEMBER(z80ne_state::z80ne_cassette_tc)
 	}
 }
 
-
-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 @@ void z80ne_state::device_timer(emu_timer &timer, device_timer_id id, int param,
 	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 @@ void z80net_state::reset_lx387()
 	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 @@ void z80netf_state::reset_lx390_banking()
 		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 @@ void z80ne_state::base_reset()
 	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 @@ void z80netf_state::machine_reset()
 	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 @@ void z80ne_state::lx383_w(offs_t offset, uint8_t data)
 	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 @@ void z80netf_state::lx390_motor_w(uint8_t data)
 
 	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 @@ void z80netf_state::lx390_motor_w(uint8_t data)
 	}
 }
 
-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 @@ uint8_t z80netf_state::lx390_fdc_r(offs_t offset)
 		break;
 	case 6:
 		d = 0xff;
-		lx390_reset_bank();
+		m_bank1->set_entry(0);
 		break;
 	case 7:
 		d = m_wd1771->data_r() ^ 0xff;