diff --git a/bh.kicad_sym b/bh.kicad_sym
index 73ab291..b451998 100755
--- a/bh.kicad_sym
+++ b/bh.kicad_sym
@@ -3,7 +3,7 @@
 	(generator "kicad_symbol_editor")
 	(generator_version "8.0")
 	(symbol "0878321420-JTAG"
-		(exclude_from_sim no)
+		(exclude_from_sim yes)
 		(in_bom yes)
 		(on_board yes)
 		(property "Reference" "P"
@@ -5568,7 +5568,7 @@
 		(pin_names
 			(offset 1.016)
 		)
-		(exclude_from_sim no)
+		(exclude_from_sim yes)
 		(in_bom yes)
 		(on_board no)
 		(property "Reference" "BOM"
@@ -6698,6 +6698,24 @@
 				(hide yes)
 			)
 		)
+		(property "Sim.Device" "C"
+			(at 0 0 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=+ 2=-"
+			(at 0 0 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(property "ki_fp_filters" "*:C_*"
 			(at 0 0 0)
 			(effects
@@ -6788,7 +6806,7 @@
 				(justify left)
 			)
 		)
-		(property "Value" "CP"
+		(property "Value" "C"
 			(at 0.635 -2.54 0)
 			(effects
 				(font
@@ -6877,6 +6895,24 @@
 				(hide yes)
 			)
 		)
+		(property "Sim.Device" "C"
+			(at 0 0 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=+ 2=-"
+			(at 0 0 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(property "ki_fp_filters" "*:CP_*"
 			(at 0 0 0)
 			(effects
@@ -6990,15 +7026,17 @@
 					(size 1.27 1.27)
 				)
 				(justify left)
+				(hide yes)
 			)
 		)
-		(property "Value" "C_PASSTHROUGH"
+		(property "Value" "C"
 			(at 0.635 -3.175 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
 				(justify left)
+				(hide yes)
 			)
 		)
 		(property "Footprint" ""
@@ -7070,9 +7108,19 @@
 				(font
 					(size 1.27 1.27)
 				)
+				(hide yes)
 			)
 		)
-		(property "FieldName" "Value"
+		(property "Sim.Device" "SPICE"
+			(at 0 0 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Params" "model=\"C NC--0 NC--1 ${Value}\nR NC--1 NC--2 1p\""
 			(at 0 0 0)
 			(effects
 				(font
@@ -7175,7 +7223,7 @@
 	)
 	(symbol "Conn_Coax"
 		(pin_names hide)
-		(exclude_from_sim no)
+		(exclude_from_sim yes)
 		(in_bom yes)
 		(on_board yes)
 		(property "Reference" "P"
@@ -7368,7 +7416,7 @@
 	(symbol "Conn_Coaxial_Switching"
 		(pin_names
 			(offset 1.016) hide)
-		(exclude_from_sim no)
+		(exclude_from_sim yes)
 		(in_bom yes)
 		(on_board yes)
 		(property "Reference" "P"
@@ -7626,7 +7674,7 @@
 		(pin_names
 			(offset 1.016)
 		)
-		(exclude_from_sim no)
+		(exclude_from_sim yes)
 		(in_bom yes)
 		(on_board yes)
 		(property "Reference" "U"
@@ -8791,7 +8839,7 @@
 		(pin_names
 			(offset 1.016)
 		)
-		(exclude_from_sim no)
+		(exclude_from_sim yes)
 		(in_bom yes)
 		(on_board yes)
 		(property "Reference" "U"
@@ -10561,7 +10609,7 @@
 		(pin_names
 			(offset 1.016)
 		)
-		(exclude_from_sim no)
+		(exclude_from_sim yes)
 		(in_bom yes)
 		(on_board yes)
 		(property "Reference" "P"
@@ -10833,7 +10881,7 @@
 		(pin_names
 			(offset 1.016)
 		)
-		(exclude_from_sim no)
+		(exclude_from_sim yes)
 		(in_bom yes)
 		(on_board yes)
 		(property "Reference" "P"
@@ -11393,7 +11441,7 @@
 		(pin_names
 			(offset 1.016)
 		)
-		(exclude_from_sim no)
+		(exclude_from_sim yes)
 		(in_bom yes)
 		(on_board yes)
 		(property "Reference" "P"
@@ -11737,7 +11785,7 @@
 		(pin_names
 			(offset 1.016)
 		)
-		(exclude_from_sim no)
+		(exclude_from_sim yes)
 		(in_bom yes)
 		(on_board yes)
 		(property "Reference" "P"
@@ -18170,7 +18218,7 @@
 		(pin_names
 			(offset 1.016)
 		)
-		(exclude_from_sim no)
+		(exclude_from_sim yes)
 		(in_bom yes)
 		(on_board yes)
 		(property "Reference" "P"
@@ -18623,8 +18671,8 @@
 		(pin_numbers hide)
 		(pin_names
 			(offset 0.762) hide)
-		(exclude_from_sim no)
-		(in_bom yes)
+		(exclude_from_sim yes)
+		(in_bom no)
 		(on_board yes)
 		(property "Reference" "FID"
 			(at 0 3.81 0)
@@ -51687,6 +51735,24 @@
 				(hide yes)
 			)
 		)
+		(property "Sim.Device" "L"
+			(at 0 0 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=+ 2=-"
+			(at 0 0 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(property "ki_fp_filters" "Choke_* *Coil* Inductor_* *:L_*"
 			(at 0 0 0)
 			(effects
@@ -53133,7 +53199,7 @@
 		)
 	)
 	(symbol "LOGO_BH"
-		(exclude_from_sim no)
+		(exclude_from_sim yes)
 		(in_bom no)
 		(on_board yes)
 		(property "Reference" "LOGO"
@@ -57771,7 +57837,7 @@
 		)
 	)
 	(symbol "MicroSD"
-		(exclude_from_sim no)
+		(exclude_from_sim yes)
 		(in_bom yes)
 		(on_board yes)
 		(property "Reference" "P"
@@ -58009,8 +58075,8 @@
 		(pin_numbers hide)
 		(pin_names
 			(offset 0.762) hide)
-		(exclude_from_sim no)
-		(in_bom yes)
+		(exclude_from_sim yes)
+		(in_bom no)
 		(on_board yes)
 		(property "Reference" "MH"
 			(at 0 7.62 0)
@@ -58160,6 +58226,24 @@
 				(hide yes)
 			)
 		)
+		(property "Sim.Device" "SPICE"
+			(at 0 0 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Params" "model=\"R NC--0 NC--1 1p\""
+			(at 0 0 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(property "ki_fp_filters" "TIE"
 			(at 0 0 0)
 			(effects
@@ -64244,6 +64328,24 @@
 				(hide yes)
 			)
 		)
+		(property "Sim.Device" "R"
+			(at 0 0 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=+ 2=-"
+			(at 0 0 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(property "ki_fp_filters" "*:R_*"
 			(at 0 0 0)
 			(effects
@@ -92108,7 +92210,7 @@
 		(pin_numbers hide)
 		(pin_names
 			(offset 0.762) hide)
-		(exclude_from_sim no)
+		(exclude_from_sim yes)
 		(in_bom yes)
 		(on_board yes)
 		(property "Reference" "TP"
@@ -94026,7 +94128,7 @@
 	(symbol "TRANSITION"
 		(pin_numbers hide)
 		(pin_names hide)
-		(exclude_from_sim no)
+		(exclude_from_sim yes)
 		(in_bom no)
 		(on_board yes)
 		(property "Reference" "TRANS"
@@ -107287,7 +107389,7 @@
 	)
 	(symbol "XT60"
 		(pin_names hide)
-		(exclude_from_sim no)
+		(exclude_from_sim yes)
 		(in_bom yes)
 		(on_board yes)
 		(property "Reference" "P"