diff --git a/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java b/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java
index e9477baf2..c42aec1b0 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java
@@ -260,27 +260,21 @@ public class InnerTube extends ThicknessRingComponent implements AxialPositionab
 	}
 	
 	public List<Coordinate> getClusterPoints() {
-		List<Coordinate> list = new ArrayList<Coordinate>(getInstanceCount());
+		List<Coordinate> list = new ArrayList<>(getInstanceCount());
 		List<Double> points = cluster.getPoints(clusterRotation - getRadialDirection());
 		double separation = getClusterSeparation();
+		double yOffset = this.radialPosition * Math.cos(this.radialDirection);
+		double zOffset = this.radialPosition * Math.sin(this.radialDirection);
 		for (int i = 0; i < points.size() / 2; i++) {
-			list.add(new Coordinate(0, points.get(2 * i) * separation, points.get(2 * i + 1) * separation));
+			list.add(new Coordinate(0, points.get(2 * i) * separation + yOffset, points.get(2 * i + 1) * separation + zOffset));
 		}
 		return list;
 	}
 	
 	@Override
 	public Coordinate[] getInstanceOffsets(){
-		
-		if ( 1 == getInstanceCount()) {
-			double yOffset = this.radialPosition * Math.cos(this.radialDirection);
-			double zOffset = this.radialPosition * Math.sin(this.radialDirection);
-			return new Coordinate[] { Coordinate.ZERO.add(0.0, yOffset, zOffset) };
-		}
-		
 		List<Coordinate> points = getClusterPoints();
-		
-		return points.toArray( new Coordinate[ points.size() ]);
+		return points.toArray(new Coordinate[0]);
 	}
 	
 //	@Override
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java
index b0386fad3..c98e2c6c2 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java
@@ -505,6 +505,7 @@ class ClusterSelectionPanel extends JPanel {
 			setMaximumSize(new Dimension(BUTTON_SIZE, BUTTON_SIZE));
 			setBorder(BorderFactory.createBevelBorder(BevelBorder.LOWERED));
 			//			setBorder(BorderFactory.createLineBorder(Color.BLACK, 1));
+			setToolTipText(config.getXMLName());
 			component.addChangeListener(this);
 			addMouseListener(this);
 		}