diff --git a/wpilibc/wpilibC++/include/AnalogPotentiometer.h b/wpilibc/wpilibC++/include/AnalogPotentiometer.h
index dbdf91c803..ae75bb0e27 100644
--- a/wpilibc/wpilibC++/include/AnalogPotentiometer.h
+++ b/wpilibc/wpilibC++/include/AnalogPotentiometer.h
@@ -66,6 +66,7 @@ public:
      */
     virtual double PIDGet();
 
+
     /*
      * Live Window code, only does anything if live window is activated.
      */
@@ -85,9 +86,9 @@ public:
     virtual void StopLiveWindowMode() {}
 
 private:
-    int m_channel;
+    int m_module, m_channel;
     double m_scale, m_offset;
-    AnalogInput* m_analog_channel;
+    AnalogInput* m_analog_input;
     ITable* m_table;
 
     /**
diff --git a/wpilibc/wpilibC++/lib/AnalogPotentiometer.cpp b/wpilibc/wpilibC++/lib/AnalogPotentiometer.cpp
index 1e682e5a35..df0cfdea47 100644
--- a/wpilibc/wpilibC++/lib/AnalogPotentiometer.cpp
+++ b/wpilibc/wpilibC++/lib/AnalogPotentiometer.cpp
@@ -5,7 +5,7 @@ void AnalogPotentiometer::initPot(int channel, double scale, double offset) {
     m_channel = channel;
     m_scale = scale;
     m_offset = offset;
-    m_analog_channel = new AnalogInput(channel);
+    m_analog_input = new AnalogInput(channel);
 }
 
 AnalogPotentiometer::AnalogPotentiometer(int channel, double scale, double offset) {
@@ -22,7 +22,7 @@ AnalogPotentiometer::AnalogPotentiometer(int channel) {
 
 
 double AnalogPotentiometer::Get() {
-    return m_analog_channel->GetVoltage() * m_scale + m_offset;
+    return m_analog_input->GetVoltage() * m_scale + m_offset;
 }
 
 double AnalogPotentiometer::PIDGet() {
diff --git a/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/AnalogPotentiometer.java b/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/AnalogPotentiometer.java
index db242189df..511313d052 100644
--- a/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/AnalogPotentiometer.java
+++ b/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/AnalogPotentiometer.java
@@ -43,7 +43,7 @@ public class AnalogPotentiometer implements Potentiometer, LiveWindowSendable {
     public AnalogPotentiometer(final int channel, double scale, double offset) {
         initPot(channel, scale, offset);
     }
-
+    
     /**
      * AnalogPotentiometer constructor.
      *
@@ -79,7 +79,6 @@ public class AnalogPotentiometer implements Potentiometer, LiveWindowSendable {
         return m_analog_input.getVoltage() * m_scale + m_offset;
     }
 
-
     /**
      * Implement the PIDSource interface.
      *
@@ -89,6 +88,7 @@ public class AnalogPotentiometer implements Potentiometer, LiveWindowSendable {
         return get();
     }
 
+
     /*
      * Live Window code, only does anything if live window is activated.
      */
diff --git a/wpilibj/wpilibJavaSim/src/main/java/edu/wpi/first/wpilibj/AnalogChannel.java b/wpilibj/wpilibJavaSim/src/main/java/edu/wpi/first/wpilibj/AnalogChannel.java
index de019a30f3..23bc1dbde0 100644
--- a/wpilibj/wpilibJavaSim/src/main/java/edu/wpi/first/wpilibj/AnalogChannel.java
+++ b/wpilibj/wpilibJavaSim/src/main/java/edu/wpi/first/wpilibj/AnalogChannel.java
@@ -98,7 +98,7 @@ public class AnalogChannel extends SensorBase implements PIDSource,
 		return m_moduleNumber;
 	}
 
-	/*
+    /**
 	 * Get the average value for use with PIDController
 	 *
 	 * @return the average value
@@ -107,7 +107,7 @@ public class AnalogChannel extends SensorBase implements PIDSource,
 		return getAverageVoltage();
 	}
 
-	/*
+    /**
 	 * Live Window code, only does anything if live window is activated.
 	 */
 	public String getSmartDashboardType() {
diff --git a/wpilibj/wpilibJavaSim/src/main/java/edu/wpi/first/wpilibj/SensorBase.java b/wpilibj/wpilibJavaSim/src/main/java/edu/wpi/first/wpilibj/SensorBase.java
index 23909c0a53..86edcac123 100644
--- a/wpilibj/wpilibJavaSim/src/main/java/edu/wpi/first/wpilibj/SensorBase.java
+++ b/wpilibj/wpilibJavaSim/src/main/java/edu/wpi/first/wpilibj/SensorBase.java
@@ -12,12 +12,13 @@ package edu.wpi.first.wpilibj;
  * Stores most recent status information as well as containing utility functions for checking
  * channels and error processing.
  *
+ * 
  * XXX: Wait, there's no exception thrown if we try to allocate a non-existent module?  It that behavior correct?
  */
 public abstract class SensorBase { // TODO: Refactor
 
 	// TODO: Move this to the HAL
-
+  
     /**
      * Ticks per microsecond
      */