diff --git a/darkwater_640/PCA9685.py b/darkwater_640/PCA9685.py
index 7924d17..f982701 100644
--- a/darkwater_640/PCA9685.py
+++ b/darkwater_640/PCA9685.py
@@ -108,11 +108,11 @@ class PCA9685(object):
         prescaleval /= float(freq_hz)
         prescaleval -= 1.0
         if (self.debug):
-          print "Setting PWM frequency to %d Hz" % freq_hz
-          print "Estimated pre-scale: %d" % prescaleval
+          print("Setting PWM frequency to %d Hz" % freq_hz)
+          print("Estimated pre-scale: %d" % prescaleval)
         prescale = math.floor(prescaleval * correctionFactor + 0.5)
         if (self.debug):
-          print "Final pre-scale: %d" % prescale
+          print("Final pre-scale: %d" % prescale)
 
         oldmode = self.i2c.readU8(self.__MODE1);
         newmode = (oldmode & 0x7F) | 0x10             # sleep
@@ -129,11 +129,11 @@ class PCA9685(object):
         prescaleval /= float(freq_hz)
         prescaleval -= 1.0
         if (self.debug):
-          print "Setting PWM frequency to %d Hz" % freq_hz
-          print "Estimated pre-scale: %d" % prescaleval
+          print("Setting PWM frequency to %d Hz" % freq_hz)
+          print("Estimated pre-scale: %d" % prescaleval)
         prescale = math.ceil(prescaleval * correctionFactor + 0.5)
         if (self.debug):
-          print "Final pre-scale: %d" % prescale
+          print("Final pre-scale: %d" % prescale)
 
         oldmode = self.i2c.readU8(self.__MODE1);
         newmode = (oldmode & 0x7F) | 0x10             # sleep
@@ -147,8 +147,8 @@ class PCA9685(object):
         prescale = self.i2c.readU8(self.__PRESCALE)
         calcfreq = 25000000.0 / 4096.0 / ( float(prescale) + 1 )
         if (self.debug):
-          print "Got pre-scale: %d" % prescale
-          print "Calculated Frequency: %d" % calcfreq
+          print("Got pre-scale: %d" % prescale)
+          print("Calculated Frequency: %d" % calcfreq)
 
         return calcfreq
 
diff --git a/darkwater_640/darkwater_640.py b/darkwater_640/darkwater_640.py
index f63892e..ffda102 100644
--- a/darkwater_640/darkwater_640.py
+++ b/darkwater_640/darkwater_640.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 import RPi.GPIO as GPIO
-from PCA9685 import PCA9685
+from .PCA9685 import PCA9685
 import time
 import math
 
@@ -71,7 +71,7 @@ class dw_Stepper:
         def off(self):
                 self.run(dw_Controller.STOP, 0)
 
-        def setSpeed(self, rpm):
+        def setMotorSpeed(self, rpm):
                 self.sec_per_step = 60.0 / (self.revsteps * rpm)
                 self.steppingcounter = 0
 
@@ -173,8 +173,6 @@ class dw_Stepper:
                       s_per_s /= self.MICROSTEPS
                       steps *= self.MICROSTEPS
 
-              print s_per_s, " sec per step"
-
               for s in range(steps):
                       lateststep = self.oneStep(direction, stepstyle)
                       time.sleep(s_per_s)
@@ -303,7 +301,7 @@ class dw_Servo:
 
         def setAngle(self, angle):
                 pulse = self.servo_zero + ( (self.servo_zero - self.servo_min ) * angle / 80 )
-                print "angle=%s pulse=%s" % (angle, pulse)
+                #print "angle=%s pulse=%s" % (angle, pulse)
                 #self.setPWMmS( pulse )
 
         def setPWM(self, value):