diff --git a/src/net/i2p/itoopie/gui/component/BandwidthChart.java b/src/net/i2p/itoopie/gui/component/BandwidthChart.java
index 129f15226..ff5080665 100644
--- a/src/net/i2p/itoopie/gui/component/BandwidthChart.java
+++ b/src/net/i2p/itoopie/gui/component/BandwidthChart.java
@@ -31,8 +31,8 @@ import net.i2p.itoopie.i18n.Transl;
 
 public class BandwidthChart {
 	private static ConfigurationManager _conf = ConfigurationManager.getInstance();
-	private final static int DEFAULT_UPDATE_INTERVAL = 2500; // Update every 2500th ms
-	private final static int DEFAULT_GRAPH_INTERVAL = 2*3600; // The graph will cover a maximum of 2hrs
+	private final static int DEFAULT_UPDATE_INTERVAL = 10000; // Update every 2500th ms
+	private final static int DEFAULT_GRAPH_INTERVAL = 2*3600*1000; // The graph will cover a maximum of 2hrs
 	private final static String DATE_FORMAT = "HH:mm:ss";
 	
 	public static Chart2D getChart(){
@@ -42,7 +42,7 @@ public class BandwidthChart {
 	    Chart2D chart = new Chart2D();
 	    chart.setUseAntialiasing(true);
 	    chart.setMinPaintLatency(20);
-	    ITrace2D dataBWIn = new Trace2DLtd( updateInterval*graphInterval );
+	    ITrace2D dataBWIn = new Trace2DLtd( graphInterval/updateInterval );
 	    dataBWIn.setStroke(new BasicStroke(1));
 	    dataBWIn.setColor(new Color(255, 0, 0, 255));
 	    dataBWIn.setName(Transl._("Bandwidth In [KB/s]"));
@@ -51,7 +51,7 @@ public class BandwidthChart {
 	    dataBWIn.setTracePainter(dotPainter);
 	    chart.addTrace(dataBWIn);
 	
-	    ITrace2D dataBWOut = new Trace2DLtd( updateInterval*graphInterval );
+	    ITrace2D dataBWOut = new Trace2DLtd( graphInterval/updateInterval );
 	    dataBWOut.setStroke(new BasicStroke(1));
 	    dataBWOut.setColor(new Color(0, 0, 255, 255));
 	    dataBWOut.setName(Transl._("Bandwidth Out [KB/s]"));
@@ -73,9 +73,9 @@ public class BandwidthChart {
 	    // force ranges:
 	    chart.getAxisY().setRangePolicy(new RangePolicyMinimumViewport(new Range(0, 5)));
 
-	    new ObjRecorder2Trace2DAdapter(dataBWIn, new BandwidthTracker("bw.sendRate", 60*1000L), "m_value", updateInterval);
+	    new ObjRecorder2Trace2DAdapter(dataBWOut, new BandwidthTracker("bw.sendRate", 60*1000L), "m_value", updateInterval);
 //	    new ObjRecorder2Trace2DAdapter(dataBWIn, new DummyDataCollector(0.5, 1000), "m_number", updateInterval);
-	    new ObjRecorder2Trace2DAdapter(dataBWOut, new BandwidthTracker("bw.recvRate", 60*1000L), "m_value", updateInterval);
+	    new ObjRecorder2Trace2DAdapter(dataBWIn, new BandwidthTracker("bw.recvRate", 60*1000L), "m_value", updateInterval);
 //	    new ObjRecorder2Trace2DAdapter(dataBWOut, new DummyDataCollector(0.5, 1000), "m_number", updateInterval);
 	    return chart;
 	}
diff --git a/src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java b/src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java
index 551856c57..9c315ae55 100644
--- a/src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java
+++ b/src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java
@@ -30,8 +30,8 @@ import net.i2p.itoopie.i18n.Transl;
 
 public class ParticipatingTunnelsChart {
 	private static ConfigurationManager _conf = ConfigurationManager.getInstance();
-	private final static int DEFAULT_UPDATE_INTERVAL = 1000; // Update every 1000th ms
-	private final static int DEFAULT_GRAPH_INTERVAL = 2*3600; // The graph will cover a maximum of 2hrs
+	private final static int DEFAULT_UPDATE_INTERVAL = 10000; // Update every 1000th ms
+	private final static int DEFAULT_GRAPH_INTERVAL = 2*3600*1000; // The graph will cover a maximum of 2hrs
 	private final static String DATE_FORMAT = "HH:mm:ss";
 	
 	public static Chart2D getChart(){
@@ -41,7 +41,7 @@ public class ParticipatingTunnelsChart {
 	    Chart2D chart = new Chart2D();
 	    chart.setUseAntialiasing(true);
 	    chart.setMinPaintLatency(20);
-	    ITrace2D dataPartTunnels = new Trace2DLtd( updateInterval*graphInterval );
+	    ITrace2D dataPartTunnels = new Trace2DLtd(  graphInterval/updateInterval  );
 	    dataPartTunnels.setStroke(new BasicStroke(1));
 	    dataPartTunnels.setColor(new Color(255, 0, 0, 255));
 	    dataPartTunnels.setName(Transl._("Number of tunnels we are participating in."));
@@ -64,7 +64,7 @@ public class ParticipatingTunnelsChart {
 	    // force ranges:
 	    chart.getAxisY().setRangePolicy(new RangePolicyMinimumViewport(new Range(0, 20)));
 
-	    new ObjRecorder2Trace2DAdapter(dataPartTunnels, new RateStatTracker("tunnel.participatingTunnels", 3600000L), "m_value", updateInterval);
+	    new ObjRecorder2Trace2DAdapter(dataPartTunnels, new RateStatTracker("tunnel.participatingTunnels", 60*1000L), "m_value", updateInterval);
 	    //new ObjRecorder2Trace2DAdapter(dataPartTunnels, new DummyDataCollector(0.5, 1000), "m_number", updateInterval);
 	    return chart;
 	}