diff --git a/flight/Project/Windows USB/OpenPilot-CDC.inf b/flight/Project/Windows USB/OpenPilot-CDC.inf
index a33223129..7b799c8b0 100644
--- a/flight/Project/Windows USB/OpenPilot-CDC.inf	
+++ b/flight/Project/Windows USB/OpenPilot-CDC.inf	
@@ -10,9 +10,11 @@ DriverVer=10/15/2009,1.0.0.0
 
 [DeviceList.NTx86]
 %CopterControl%= DriverInstall,USB\VID_20A0&PID_415b&MI_00
+%PipXtreme%= DriverInstall,USB\VID_20A0&PID_415c&MI_00
 
 [DeviceList.NTamd64]
 %CopterControl%= DriverInstall,USB\VID_20A0&PID_415b&MI_00
+%PipXtreme%= DriverInstall,USB\VID_20A0&PID_415c&MI_00
 
 [DriverInstall]
 include=mdmcpq.inf
@@ -30,3 +32,4 @@ HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
 [Strings]
 ProviderName = "CDC Driver"
 CopterControl = "OpenPilot CDC Driver"
+PipXtreme = "OpenPilot CDC Driver"
diff --git a/flight/board_hw_defs/pipxtreme/board_hw_defs.c b/flight/board_hw_defs/pipxtreme/board_hw_defs.c
index bb17bf1ca..bf2e713f6 100644
--- a/flight/board_hw_defs/pipxtreme/board_hw_defs.c
+++ b/flight/board_hw_defs/pipxtreme/board_hw_defs.c
@@ -7,10 +7,8 @@ static const struct pios_led pios_leds[] = {
 	[PIOS_LED_USB] = {
 		.pin = {
 			.gpio = GPIOA,
-			//.gpio = GPIOC,
 			.init = {
 				.GPIO_Pin   = GPIO_Pin_3,
-				//.GPIO_Pin   = GPIO_Pin_13,
 				.GPIO_Mode  = GPIO_Mode_Out_PP,
 				.GPIO_Speed = GPIO_Speed_50MHz,
 			},
@@ -301,20 +299,17 @@ static const struct pios_tim_clock_cfg tim_4_cfg = {
 };
 
 static const struct pios_tim_channel pios_tim_ppm_flexi_port = {
-	//.timer = TIM2,
-	.timer = TIM4,
-	//.timer_chan = TIM_Channel_4,
+	.timer = TIM2,
 	.timer_chan = TIM_Channel_4,
 	.pin = {
 		.gpio = GPIOB,
 		.init = {
-			//.GPIO_Pin   = GPIO_Pin_11,
-			.GPIO_Pin   = GPIO_Pin_9,
+			.GPIO_Pin   = GPIO_Pin_11,
 			.GPIO_Mode  = GPIO_Mode_IPD,
 			.GPIO_Speed = GPIO_Speed_2MHz,
 		},
 	},
-	//.remap = GPIO_PartialRemap_TIM2,
+	.remap = GPIO_PartialRemap2_TIM2,
 };
 
 #endif	/* PIOS_INCLUDE_TIM */
diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
index 99b89e32e..e6558a877 100644
--- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
@@ -959,6 +959,10 @@ QVariant ConfigTaskWidget::getVariantFromWidget(QWidget * widget,double scale)
     {
         return (QString)(cb->isChecked()?"TRUE":"FALSE");
     }
+    else if(QLineEdit * cb=qobject_cast<QLineEdit *>(widget))
+    {
+        return (QString)cb->displayText();
+    }
     else
         return QVariant();
 }
@@ -1011,6 +1015,7 @@ bool ConfigTaskWidget::setWidgetFromVariant(QWidget *widget, QVariant value, dou
             cb->setText(value.toString());
         else
             cb->setText(QString::number((value.toDouble()/scale)));
+        return true;
     }
     else
         return false;