--- a/python/moving.py	Mon Jul 23 12:35:45 2012 -0400
+++ b/python/moving.py	Mon Jul 23 23:07:19 2012 -0400
@@ -245,11 +245,11 @@
 
     def __add__(self, other):
         'a norm cannot become negative'
-        return NormAngle(max(self.norm+other.norm, 0), self.orientation+other.orientation)
+        return NormAngle(max(self.norm+other.norm, 0), self.angle+other.angle)
 
     def getPoint(self):
         from math import cos, sin
-        return Point(self.norm*cos(self.orientation), self.norm*sin(self.orientation))
+        return Point(self.norm*cos(self.angle), self.norm*sin(self.angle))
 
 
 def predictPositionNoLimit(nTimeSteps, initialPosition, initialVelocity, initialAcceleration = Point(0,0)):
@@ -571,7 +571,7 @@
     def predictPosition(self, instant, nTimeSteps, externalAcceleration = Point(0,0)):
         '''Predicts the position of object at instant+deltaT, 
         at constant speed'''
-        return predictPosition(nTimeSteps, self.getPositionAtInstant(instant), self.getVelocityAtInstant(instant), externalAcceleration)
+        return predictPositionNoLimit(nTimeSteps, self.getPositionAtInstant(instant), self.getVelocityAtInstant(instant), externalAcceleration)
 
     @staticmethod
     def collisionCourseDotProduct(movingObject1, movingObject2, instant):