diff --git a/python/machines.py b/python/machines.py
index c0c2071..2c2fbc9 100644
--- a/python/machines.py
+++ b/python/machines.py
@@ -90,9 +90,16 @@ SLOTS = (
 	# st
 	"centronics", "mdin", "mdout",
 
+	# amiga
+	"zorro1", "zorro2", "zorro3", "zorro4", "zorro5",
+
 	# dec
 	"eia", "host", "com_prt", "prt_port",
-	"rs232a", "rs232b", "serial0", "serial1", 
+	"rs232a", "rs232b", "serial0", "serial1", "tty0", "tty1",
+	"kbd", "mse", "keyboard", "kbd_con", "mouseport", 
+
+	"isa0", "isa1", "isa2", "isa3", "isa4", "isa5", "isa6", "isa7", "isa8", "isa9",
+	"qbus:1", "qbus:2", "qbus:3", "qbus:4", "qbus:5",
 )
 
 SLOT_NAMES = {
@@ -108,7 +115,7 @@ SLOT_NAMES = {
 	"sl7":        "Slot 7",
 	"exp":        "Expansion",
 	"aux":        "Auxiliary",
-	"rs232":      "Modem",
+	"rs232":      "Serial",
 	"gameio":     "Game I/O",
 	"modem":      "Modem",
 	"printer":    "Printer",
@@ -128,6 +135,19 @@ SLOT_NAMES = {
 	"mdin":       "MIDI In",
 	"mdout":      "MIDI Out",
 
+	"zorro1":     "Zorro 1",
+	"zorro2":     "Zorro 2",
+	"zorro3":     "Zorro 3",
+	"zorro4":     "Zorro 4",
+	"zorro5":     "Zorro 5",
+
+
+	"kbd":        "Keyboard",
+	"keyboard":   "Keyboard",
+	"kbd_con":    "Keyboard",
+	"mse":        "Mouse",
+	"mouseport":  "Mouse",
+
 	"eia":        "Serial",
 	"host":       "Serial",
 	"com_prt":    "Serial",
@@ -136,4 +156,23 @@ SLOT_NAMES = {
 	"rs232b":     "Serial B",
 	"serial0":    "Serial 0",
 	"serial1":    "Serial 1",
+	"tty0":       "TTY 0",
+	"tty1":       "TTY 1",
+
+	"isa0":       "Slot 0",
+	"isa1":       "Slot 1",
+	"isa2":       "Slot 2",
+	"isa3":       "Slot 3",
+	"isa4":       "Slot 4",
+	"isa5":       "Slot 5",
+	"isa6":       "Slot 6",
+	"isa7":       "Slot 7",
+	"isa8":       "Slot 8",
+	"isa9":       "Slot 9",
+
+	"qbus:1":     "Q-Bus 1",
+	"qbus:2":     "Q-Bus 2",
+	"qbus:3":     "Q-Bus 3",
+	"qbus:4":     "Q-Bus 4",
+	"qbus:5":     "Q-Bus 5",
 }
diff --git a/python/mkmachines.py b/python/mkmachines.py
index dcd037f..137519a 100644
--- a/python/mkmachines.py
+++ b/python/mkmachines.py
@@ -191,7 +191,7 @@ def find_machine_media(parent):
 		slotlist.add(slotname)
 
 	# print(slotlist)
-	for name in ("scsi","scsibus","scsi1"):
+	for name in ("scsi","scsibus","scsi0", "scsi1"):
 		if name + ":4" in slotlist and name + ":3" not in slotlist:
 			media["cdrom"] = media.get("cdrom", 0) + 1
 
@@ -414,21 +414,6 @@ def make_device_slots(machine):
 
 	mname = machine.get('name')
 
-	# add missing cd-rom scsi slot1
-	# s0 = machine.find('./slot[@name=":scsibus:0"]')
-	# s1 = machine.find('./slot[@name=":scsibus:1"]')
-	# if s0 and not s1:
-	# 	s1 = deepcopy(s0)
-	# 	s1.set('name', ':scsibus:1')
-	# 	s1.find('slotoption[@name="cdrom"]').set('default','yes')
-	# 	for ix in range(0, len(machine)):
-	# 		if machine[ix] == s0:
-	# 			machine.insert(ix+1, s1)
-	# 			break
-	# 	#machine.insert(5,s1)
-
-
-
 	slots = []
 	for slot in machine.findall('./slot'):
 		slotname = slot.get("name")
@@ -529,6 +514,8 @@ def make_smartport(machine):
 	SLOTS = [
 		*['fdc:' + str(x) for x in range(0,4)],
 		*['scsi:' + str(x) for x in range(0,7)],
+		*['scsi0:' + str(x) for x in range(0,7)],
+		*['scsi1:' + str(x) for x in range(0,7)],
 		*['scsibus:' + str(x) for x in range(0,7)],
 		*['wd1772:' + str(x) for x in range(0,4)],