diff --git a/library/motors.dcm b/library/motors.dcm
index dc547397..546d8016 100644
--- a/library/motors.dcm
+++ b/library/motors.dcm
@@ -16,6 +16,18 @@ K Fan tacho pin 3-pin fan
 F http://www.hardwarecanucks.com/forum/attachments/new-builds/16287d1330775095-help-chassis-power-fan-connectors-motherboard-asus_p8z68.jpg
 $ENDCMP
 #
+$CMP FAN_3pin
+D Fan with tacho pin (3-pin fan)
+K Fan tacho pin 3-pin fan
+F http://www.hardwarecanucks.com/forum/attachments/new-builds/16287d1330775095-help-chassis-power-fan-connectors-motherboard-asus_p8z68.jpg
+$ENDCMP
+#
+$CMP FAN_PC_CHASSIS
+D PC chassis fan with tacho pin (3-pin fan)
+K PC chassis fan tacho pin 3-pin fan
+F http://www.hardwarecanucks.com/forum/attachments/new-builds/16287d1330775095-help-chassis-power-fan-connectors-motherboard-asus_p8z68.jpg
+$ENDCMP
+#
 $CMP FAN_TACHO_PWM
 D Fan with tacho and PWM pins (4-pin)
 K Fan tacho pin PWM pin 4-pin fan CPU fan
@@ -55,6 +67,36 @@ K Servo Motor Futaba HiTec JR
 F http://forums.parallax.com/uploads/attachments/46831/74481.png
 $ENDCMP
 #
+$CMP Motor_Servo_JR
+D Servo Motor (JR pinput)
+K Servo Motor JR
+F http://forums.parallax.com/uploads/attachments/46831/74481.png
+$ENDCMP
+#
+$CMP Motor_Servo_Hitec
+D Servo Motor (HiTec pinput)
+K Servo Motor HiTec
+F http://forums.parallax.com/uploads/attachments/46831/74481.png
+$ENDCMP
+#
+$CMP Motor_Servo_Futaba_J
+D Servo Motor (Futuba J-connector)
+K Servo Motor Futuba J-connector
+F http://forums.parallax.com/uploads/attachments/46831/74481.png
+$ENDCMP
+#
+$CMP Motor_Servo_Robbe
+D Servo Motor (Robbe pinput)
+K Servo Motor Robbe
+F http://forums.parallax.com/uploads/attachments/46831/74481.png
+$ENDCMP
+#
+$CMP Motor_Servo_Grapner_JR
+D Servo Motor (Graupner JR connector)
+K Servo Motor Graupner JR
+F http://forums.parallax.com/uploads/attachments/46831/74481.png
+$ENDCMP
+#
 $CMP Motor_Servo_AirTronics
 D Servo Motor (Futaba, HiTec, JR pinput)
 K Servo Motor Futaba HiTec JR
diff --git a/library/motors.lib b/library/motors.lib
index 5c9d4b59..bb56907d 100644
--- a/library/motors.lib
+++ b/library/motors.lib
@@ -160,7 +160,6 @@ F0 "M" 100 -100 50 H V L CNN
 F1 "Motor_DC" 100 -400 50 H I L TNN
 F2 "" 0 -290 50 H I C CNN
 F3 "" 0 -290 50 H I C CNN
-ALIAS Motor
 $FPLIST
  Pin_Headers:Pin_Header_Straight_1x02
  Connect:bornier2
@@ -185,7 +184,6 @@ F0 "M" 100 -100 50 H V L CNN
 F1 "Motor_DC_ALT" 100 -400 50 H I L TNN
 F2 "" 0 -290 50 H I C CNN
 F3 "" 0 -290 50 H I C CNN
-ALIAS Motor_ALT
 $FPLIST
  Pin_Headers:Pin_Header_Straight_1x02
  Connect:bornier2