diff --git a/nmap-os-db b/nmap-os-db
index 6e8f3d53a..b127882e6 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -343,7 +343,7 @@ IE(DFI=N%T=FA-104%TG=FF%TOSI=Z%CD=S%SI=S%DLI=S)
 # 3Com SuperStack 3 Switch 4400 SE
 Fingerprint 3Com SuperStack 3 Switch 4400 SE
 Class 3Com | embedded || switch
-SEQ(SP=0-5%GCD=%ISR=0-5%TI=I%II=I%SS=S%TS=U)
+SEQ(SP=0-5%ISR=0-5%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M594%O2=M594%O3=M594%O4=M594%O5=M594%O6=M594)
 WIN(W1=400%W2=400%W3=400%W4=400%W5=400%W6=400)
 ECN(R=Y%DF=N%T=FA-104%TG=FF%W=400%O=M594%CC=N%Q=)
@@ -29356,23 +29356,6 @@ T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=O|S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FA-104%TG=FF%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%TOSI=S%CD=S%SI=S%DLI=S)
 
-# FWD-40LX2F, embedded card inside a LCD/Projector/etc. Used as a part of sonys embedded signage system called Zirius.
-Fingerprint Sony FWD-40LX2F display card
-Class Sony | embedded || specialized
-SEQ(SP=C9-D3%GCD=<7%ISR=D7-E1%TI=I%II=I%SS=O|S%TS=U)
-OPS(R=N)
-WIN(R=N)
-ECN(R=N)
-T1(R=Y%DF=N%T=73-7D%TG=80%S=O%A=O|S+%F=A|AS%RD=0%Q=)
-T2(R=N)
-T3(R=N)
-T4(R=Y%DF=N%T=73-7D%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=73-7D%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=73-7D%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=73-7D%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=73-7D%TG=80%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=97F3%RUL=G%RUD=G)
-IE(DFI=N%T=73-7D%TG=80%TOSI=Z%CD=Z%SI=S%DLI=S)
-
 # Sony Bravia BE2 LCD TV (KDL-40X4500)
 Fingerprint Sony Bravia BE2 LCD TV
 Class Sony | embedded || media device
@@ -29390,6 +29373,23 @@ T7(R=N)
 U1(DF=N%T=72%TG=80%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=15B2%RUL=G%RUD=G)
 IE(DFI=N%T=72%TG=80%TOSI=Z%CD=Z%SI=S%DLI=S)
 
+# FWD-40LX2F, embedded card inside a LCD/Projector/etc. Used as a part of sonys embedded signage system called Zirius.
+Fingerprint Sony FWD-40LX2F display card
+Class Sony | embedded || specialized
+SEQ(SP=C9-D3%GCD=<7%ISR=D7-E1%TI=I%II=I%SS=O|S%TS=U)
+OPS(R=N)
+WIN(R=N)
+ECN(R=N)
+T1(R=Y%DF=N%T=73-7D%TG=80%S=O%A=O|S+%F=A|AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=N%T=73-7D%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=73-7D%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=73-7D%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=73-7D%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=73-7D%TG=80%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=97F3%RUL=G%RUD=G)
+IE(DFI=N%T=73-7D%TG=80%TOSI=Z%CD=Z%SI=S%DLI=S)
+
 # This is a Sony PCS-TL30 Video Conferencing Unit
 Fingerprint Sony PCS-TL30 video conferencing system
 Class Sony | embedded || webcam
@@ -29699,8 +29699,8 @@ T2(R=N)
 T3(R=N)
 T4(R=Y%DF=Y%T=23-3B%TG=20|40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
 T5(R=Y%DF=Y%T=23-3B%TG=20|40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=23-3B%TG=20|40W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=23-3B%TG=20|40W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=23-3B%TG=20|40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=23-3B%TG=20|40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=Y%T=FA-104%TG=FF%TOS=0%IPL=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=Y%T=FA-104%TG=FF%TOSI=S%CD=S%SI=S%DLI=S)
 
@@ -30717,6 +30717,23 @@ T7(R=Y%DF=Y%T=FA-104%TG=FF%W=4E20%S=A%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=Y%T=FA-104%TG=FF%TOS=0%IPL=38%UN=1A52|5A29|9A37|DA6D|DA9D%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=S%T=20-2A|30-3F%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 
+# Toshiba Digital television set (REGZA series)
+Fingerprint Toshiba REGZA TV
+Class Toshiba | embedded || media device
+SEQ(SP=BE-C8%GCD=<7%ISR=C4-CE%TI=Z%II=I%TS=A|C)
+OPS(O1=NNT11|M5B4ST11NW1%O2=NNT11|M5B4ST11NW1%O3=NNT11|M5B4NNT11NW1%O4=NNT11|M5B4ST11NW1%O5=NNT11|M5B4ST11NW1%O6=NNT11|M5B4ST11)
+WIN(W1=10F8%W2=10F8%W3=10F8%W4=10F8%W5=10F8%W6=10F8)
+ECN(R=Y%DF=Y%T=3B-45|7B-85%TG=40|80%W=111C%O=|M5B4NNSNW1%CC=N%Q=)
+T1(R=Y%DF=Y%T=3B-45|7B-85%TG=40|80%S=O%A=O|S+%F=A|AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=Y%T=3B-45|7B-85%TG=40|80%W=10F8%S=O%A=O|S+%F=A|AS%O=NNT11|M5B4ST11NW1%RD=0%Q=)
+T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=3B-45%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
+
 # Toshiba e-Studio20 printer, ROM Version 6.19 TA
 Fingerprint Toshiba e-STUDIO 20 printer
 Class Toshiba | embedded || printer
@@ -30751,23 +30768,6 @@ T7(R=Y%DF=N%T=72-7C%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=72-7C%TG=80%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=84B7%RUL=G%RUD=G)
 IE(DFI=N%T=72-7C%TG=80%TOSI=Z%CD=Z%SI=S%DLI=S)
 
-# Toshiba Digital television set (REGZA series)
-Fingerprint Toshiba REGZA TV
-Class Toshiba | embedded || media device
-SEQ(SP=BE-C8%GCD=<7%ISR=C4-CE%TI=Z%II=I%TS=A|C)
-OPS(O1=NNT11|M5B4ST11NW1%O2=NNT11|M5B4ST11NW1%O3=NNT11|M5B4NNT11NW1%O4=NNT11|M5B4ST11NW1%O5=NNT11|M5B4ST11NW1%O6=NNT11|M5B4ST11)
-WIN(W1=10F8%W2=10F8%W3=10F8%W4=10F8%W5=10F8%W6=10F8)
-ECN(R=Y%DF=Y%T=3B-45|7B-85%TG=40|80%W=111C%O=|M5B4NNSNW1%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45|7B-85%TG=40|80%S=O%A=O|S+%F=A|AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=3B-45|7B-85%TG=40|80%W=10F8%S=O%A=O|S+%F=A|AS%O=NNT11|M5B4ST11NW1%RD=0%Q=)
-T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=3B-45%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
-
 # Toshiba Magnia SG10, Linux toshiba.toshiba.loc 2.4.18-3custom #3 Tue Aug 13 15:10:18 PDT 2002 i686 unknown
 Fingerprint Toshiba Magnia SG10 server appliance (Linux 2.4.18)
 Class Toshiba | Linux | 2.4.X | general purpose