diff --git a/80386.csv b/80386.csv
index 1bafb30..7acab3c 100644
--- a/80386.csv
+++ b/80386.csv
@@ -391,18 +391,18 @@ FF,,,5,7,,1,0,0,0,0,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,Undefined
 0F9F,500,,,,,0,0,0,1,0,0,0,0,0,1,1,1,,,,,,,1,0,,,SETNLE,,,,r/m8,,,,,,,,,,Set Byte on Condition - not less nor equal/greater ((ZF=0) AND (SF=OF))
 0FA0,1000,,,,,0,0,1,0,0,0,0,0,0,0,0,0,,,,,,,1,0,,,PUSH,,,,FS,,,,,,,,,,"Push Word, Doubleword or Quadword Onto the Stack"
 0FA1,1000,,,,,0,0,1,0,0,0,0,0,0,0,0,0,,,,,,,1,0,,,POP,,,,FS,,,,,,,,,,Pop a Value from the Stack
-0FA3,2500,,,,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,,0,,,BT,,,,r/m16/32,r16/32,,,,,,,,,Bit Test
-0FA4,2500,,,,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,,0,,,SHLD,,,,r/m16/32,r16/32,imm8,,,,,,,,Double Precision Shift Left
-0FA5,2500,,,,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,,0,,,SHLD,,,,r/m16/32,r16/32,CL,,,,,,,,Double Precision Shift Left
+0FA3,2500,,,,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,,0,,,BT,,,,r/m16/32,r16/32,,,,,,0xF72B,o..sz.p.,,Bit Test
+0FA4,2500,,,,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,,0,,,SHLD,,,,r/m16/32,r16/32,imm8,,,,,0xF7EF,o.szap..,,Double Precision Shift Left
+0FA5,2500,,,,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,,0,,,SHLD,,,,r/m16/32,r16/32,CL,,,,,0xF7EF,o.szap..,,Double Precision Shift Left
 0FA8,1000,,,,,0,0,1,0,0,0,0,0,0,0,0,0,,,,,,,1,0,,,PUSH,,,,GS,,,,,,,,,,"Push Word, Doubleword or Quadword Onto the Stack"
 0FA9,1000,,,,,0,0,1,0,0,0,0,0,0,0,0,0,,,,,,,1,0,,,POP,,,,GS,,,,,,,,,,Pop a Value from the Stack
 0FAA,0,,,,,0,0,0,0,1,0,0,0,0,0,0,0,,,,,,,1,0,,,RSM,,,,,,,,,,,,,,Resume from System Management Mode
-0FAB,2500,,,,,0,0,1,1,0,0,0,1,0,1,1,1,,,,,,,,0,,,BTS,,,,r/m16/32,r16/32,,,,,,,,,Bit Test and Set
-0FAC,2500,,,,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,,0,,,SHRD,,,,r/m16/32,r16/32,imm8,,,,,,,,Double Precision Shift Right
-0FAD,2500,,,,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,,0,,,SHRD,,,,r/m16/32,r16/32,CL,,,,,,,,Double Precision Shift Right
-0FAF,2500,,,,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,,0,,,IMUL,,,,"	r16/32","	r/m16/32",,,,,,,,,Signed Multiply
+0FAB,2500,,,,,0,0,1,1,0,0,0,1,0,1,1,1,,,,,,,,0,,,BTS,,,,r/m16/32,r16/32,,,,,,0xF72B,o..sz.p.,,Bit Test and Set
+0FAC,2500,,,,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,,0,,,SHRD,,,,r/m16/32,r16/32,imm8,,,,,0xF7EF,o.szap..,,Double Precision Shift Right
+0FAD,2500,,,,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,,0,,,SHRD,,,,r/m16/32,r16/32,CL,,,,,0xF7EF,o.szap..,,Double Precision Shift Right
+0FAF,2500,,,,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,,0,,,IMUL,,,,	r16/32,	r/m16/32,,,,,,0xFF2B,o..sz.p.,,Signed Multiply
 0FB2,2500,,,,,0,0,1,1,0,0,0,0,0,1,0,1,,,,,,,,0,,,LSS,,,,r16/32,m16:16/32,,,,,,,,,Load Far Pointer
-0FB3,2500,,,,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,,0,,,BTR,,,,r/m16/32,r16/32,,,,,,,,,Bit Test and Reset
+0FB3,2500,,,,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,,0,,,BTR,,,,r/m16/32,r16/32,,,,,,0xF72B,o..sz.p.,,Bit Test and Reset
 0FB4,2500,,,,,0,0,1,1,0,0,0,0,0,1,0,1,,,,,,,,0,,,LFS,,,,r16/32,m16:16/32,,,,,,,,,Load Far Pointer
 0FB5,2500,,,,,0,0,1,1,0,0,0,0,0,1,0,1,,,,,,,,0,,,LGS,,,,r16/32,m16:16/32,,,,,,,,,Load Far Pointer
 0FB6,2500,,,,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,1,0,,,MOVZX,,,,r16/32,r/m8,,,,,,,,,Move with Zero-Extend
@@ -411,12 +411,12 @@ FF,,,5,7,,1,0,0,0,0,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,Undefined
 0FBA,,,8,1,,1,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,6,Undefined
 0FBA,,,8,2,,1,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,6,Undefined
 0FBA,,,8,3,,1,0,0,0,0,0,0,0,0,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,6,Undefined
-0FBA,2500,,8,4,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,0,0,,,BT,,,,r/m16/32,imm8,,,,,,,,,Bit Test
-0FBA,2500,,8,5,,0,0,1,1,0,0,0,1,0,1,1,1,,,,,,,,0,,,BTS,,,,r/m16/32,imm8,,,,,,,,,Bit Test and Set
-0FBA,2500,,8,6,,0,0,1,1,0,0,0,1,0,1,1,1,,,,,,,,0,,,BTR,,,,r/m16/32,imm8,,,,,,,,,Bit Test and Reset
-0FBA,2500,,8,7,,0,0,1,1,0,0,0,1,0,1,1,1,,,,,,,,0,,,BTC,,,,r/m16/32,imm8,,,,,,,,,Bit Test and Complement
-0FBB,2500,,,,,0,0,1,1,0,0,0,1,0,1,1,1,,,,,,,0,0,,,BTC,,,,r/m16/32,r16/32,,,,,,,,,Bit Test and Complement
-0FBC,2500,,,,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,,0,,,BSF,,,,r16/32,r/m16/32,,,,,,,,,Bit Scan Forward
-0FBD,2500,,,,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,,0,,,BSR,,,,r16/32,r/m16/32,,,,,,,,,Bit Scan Reverse
+0FBA,2500,,8,4,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,0,0,,,BT,,,,r/m16/32,imm8,,,,,,0xF72B,o..sz.p.,,Bit Test
+0FBA,2500,,8,5,,0,0,1,1,0,0,0,1,0,1,1,1,,,,,,,,0,,,BTS,,,,r/m16/32,imm8,,,,,,0xF72B,o..sz.p.,,Bit Test and Set
+0FBA,2500,,8,6,,0,0,1,1,0,0,0,1,0,1,1,1,,,,,,,,0,,,BTR,,,,r/m16/32,imm8,,,,,,0xF72B,o..sz.p.,,Bit Test and Reset
+0FBA,2500,,8,7,,0,0,1,1,0,0,0,1,0,1,1,1,,,,,,,,0,,,BTC,,,,r/m16/32,imm8,,,,,,0xF72B,o..sz.p.,,Bit Test and Complement
+0FBB,2500,,,,,0,0,1,1,0,0,0,1,0,1,1,1,,,,,,,0,0,,,BTC,,,,r/m16/32,r16/32,,,,,,0xF72B,o..sz.p.,,Bit Test and Complement
+0FBC,2500,,,,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,,0,,,BSF,,,,r16/32,r/m16/32,,,,,,0xF76A,..z...p.,,Bit Scan Forward
+0FBD,2500,,,,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,,0,,,BSR,,,,r16/32,r/m16/32,,,,,,0xF76A,..z...p.,,Bit Scan Reverse
 0FBE,2500,,,,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,,0,,,MOVSX,,,,r16/32,r/m8,,,,,,,,,Move with Sign-Extension
 0FBF,2500,,,,,0,0,1,1,0,0,0,0,0,1,1,1,,,,,,,,0,,,MOVSX,,,,r16/32,r/m16,,,,,,,,,Move with Sign-Extension