diff --git a/swing/src/net/sf/openrocket/gui/rocketfigure/SymmetricComponentShapes.java b/swing/src/net/sf/openrocket/gui/rocketfigure/SymmetricComponentShapes.java
index fe4b77ce3..cf41fe141 100644
--- a/swing/src/net/sf/openrocket/gui/rocketfigure/SymmetricComponentShapes.java
+++ b/swing/src/net/sf/openrocket/gui/rocketfigure/SymmetricComponentShapes.java
@@ -35,6 +35,7 @@ public class SymmetricComponentShapes extends RocketComponentShape {
 		
 		final double delta = 0.0000001;
 		double x;
+		  
 		
 		ArrayList<Coordinate> points = new ArrayList<Coordinate>();
 		x = delta;
@@ -86,16 +87,18 @@ public class SymmetricComponentShapes extends RocketComponentShape {
 
 		//System.out.println("here");
 		
+		Coordinate center = instanceOffset;
+		
 		// TODO: LOW: curved path instead of linear
 		Path2D.Double path = new Path2D.Double();
-		path.moveTo(points.get(len - 1).x * scaleFactor, points.get(len - 1).y * scaleFactor);
+		path.moveTo(points.get(len - 1).x * scaleFactor, (center.y+points.get(len - 1).y) * scaleFactor);
 		for (i = len - 2; i >= 0; i--) {
-			path.lineTo(points.get(i).x * scaleFactor, points.get(i).y * scaleFactor);
+			path.lineTo(points.get(i).x * scaleFactor, (center.y+points.get(i).y) * scaleFactor);
 		}
 		for (i = 0; i < len; i++) {
-			path.lineTo(points.get(i).x * scaleFactor, -points.get(i).y * scaleFactor);
+			path.lineTo(points.get(i).x * scaleFactor, (center.y-points.get(i).y) * scaleFactor);
 		}
-		path.lineTo(points.get(len - 1).x * scaleFactor, points.get(len - 1).y * scaleFactor);
+		path.lineTo(points.get(len - 1).x * scaleFactor, (center.y+points.get(len - 1).y) * scaleFactor);
 		path.closePath();
 		
 		//s[len] = path;
diff --git a/swing/src/net/sf/openrocket/gui/rocketfigure/TransitionShapes.java b/swing/src/net/sf/openrocket/gui/rocketfigure/TransitionShapes.java
index c5ce8e0d4..25e3dba88 100644
--- a/swing/src/net/sf/openrocket/gui/rocketfigure/TransitionShapes.java
+++ b/swing/src/net/sf/openrocket/gui/rocketfigure/TransitionShapes.java
@@ -57,18 +57,19 @@ public class TransitionShapes extends RocketComponentShape {
 		
 		if (transition.getForeShoulderLength() > 0.0005) {
 			Coordinate start = transformation.transform(transition.
-					toAbsolute(Coordinate.NUL)[0]);
+					toAbsolute(instanceOffset)[0]);
 			double r = transition.getForeShoulderRadius();
 			double l = transition.getForeShoulderLength();
-			shoulder1 = new Rectangle2D.Double((start.x-l)* scaleFactor, -r* scaleFactor, l* scaleFactor, 2*r* scaleFactor);
+			shoulder1 = new Rectangle2D.Double((start.x-l)* scaleFactor, (start.y-r)* scaleFactor, l* scaleFactor, 2*r* scaleFactor);
 			arrayLength++;
 		}
 		if (transition.getAftShoulderLength() > 0.0005) {
 			Coordinate start = transformation.transform(transition.
-					toAbsolute(new Coordinate(transition.getLength()))[0]);
+					toAbsolute(instanceOffset.add(transition.getLength(),0, 0))[0]);
+
 			double r = transition.getAftShoulderRadius();
 			double l = transition.getAftShoulderLength();
-			shoulder2 = new Rectangle2D.Double(start.x* scaleFactor, -r* scaleFactor, l* scaleFactor, 2*r* scaleFactor);
+			shoulder2 = new Rectangle2D.Double(start.x* scaleFactor, (start.y-r)* scaleFactor, l* scaleFactor, 2*r* scaleFactor);
 			arrayLength++;
 		}
 		if (shoulder1==null && shoulder2==null)
@@ -102,11 +103,10 @@ public class TransitionShapes extends RocketComponentShape {
 		double r2 = transition.getAftRadius();
 
 		Coordinate center = instanceOffset;
-		// adjust center heree... somehow
 		
 		Shape[] s = new Shape[2];
-		s[0] = new Ellipse2D.Double(-r1*S,-r1*S,2*r1*S,2*r1*S);
-		s[1] = new Ellipse2D.Double(-r2*S,-r2*S,2*r2*S,2*r2*S);
+		s[0] = new Ellipse2D.Double((center.z-r1)*S,(center.y-r1)*S,2*r1*S,2*r1*S);
+		s[1] = new Ellipse2D.Double((center.z-r2)*S,(center.y-r2)*S,2*r2*S,2*r2*S);
 		return RocketComponentShape.toArray(s, component);
 	}