diff --git a/html/includes/graphs/customer_bits.inc.php b/html/includes/graphs/customer_bits.inc.php
index c20d684f3..18a0cc7ac 100644
--- a/html/includes/graphs/customer_bits.inc.php
+++ b/html/includes/graphs/customer_bits.inc.php
@@ -2,7 +2,7 @@
 
 ## Generate a list of interfaces and then call the multi_bits grapher to generate from the list
 
-$query = mysql_query("SELECT * FROM `interfaces` AS I, `devices` AS D WHERE `ifAlias` LIKE 'Cust: ".mres($_GET['cust'])." %' AND D.device_id = I.device_id");
+$query = mysql_query("SELECT * FROM `interfaces` AS I, `devices` AS D WHERE `ifAlias` LIKE 'Cust: ".mres($_GET['cust'])."%' AND D.device_id = I.device_id");
 while($int = mysql_fetch_array($query)) {
   if(is_file($config['rrd_dir'] . "/" . $int['hostname'] . "/" . $int['ifIndex'] . ".rrd")) {
     $rrd_filenames[] = $config['rrd_dir'] . "/" . $int['hostname'] . "/" . $int['ifIndex'] . ".rrd";
diff --git a/html/includes/graphs/generic_bits.inc.php b/html/includes/graphs/generic_bits.inc.php
index 7a46246ac..53e661693 100644
--- a/html/includes/graphs/generic_bits.inc.php
+++ b/html/includes/graphs/generic_bits.inc.php
@@ -30,7 +30,7 @@ $rrd_options .= " VDEF:d95thout=doutbits,5,PERCENT";
 
 $rrd_options .= " AREA:inbits_max#aDEB7B:";
 $rrd_options .= " AREA:inbits#CDEB8B:";
-$rrd_options .= " COMMENT:BPS\ \ \ \ Now\ \ \ \ \ \ \ Ave\ \ \ \ \ \ Max\ \ \ \ \ \ 95th\ %\\\\n";
+$rrd_options .= " COMMENT:'BPS      Now       Ave      Max      95th %\\n'";
 $rrd_options .= " LINE1.25:inbits#006600:In\ ";
 $rrd_options .= " GPRINT:inbits:LAST:%6.2lf%s";
 $rrd_options .= " GPRINT:inbits:AVERAGE:%6.2lf%s";
@@ -49,6 +49,4 @@ $rrd_options .= " GPRINT:totout:Out\ %6.2lf%s\)\\\\l";
 $rrd_options .= " LINE1:95thin#aa0000";
 $rrd_options .= " LINE1:d95thout#aa0000";
 
-#echo("<pre> [ rrdtool graph $graphfile $rrd_options ] </pre> /n $rrd_filename");
-
 ?>
diff --git a/html/includes/graphs/port_nupkts.inc.php b/html/includes/graphs/port_nupkts.inc.php
index c9d03245b..c22b1079d 100644
--- a/html/includes/graphs/port_nupkts.inc.php
+++ b/html/includes/graphs/port_nupkts.inc.php
@@ -24,7 +24,7 @@ $colour_line_out = "FF6600";
 $colour_area_in_max = "cc88cc";
 $colour_area_out_max = "FFefaa";
 
-$unit_text = "NUPkts\ ";
+$unit_text = "Packets";
 
 $graph_max = 1;
 
diff --git a/html/includes/graphs/port_upkts.inc.php b/html/includes/graphs/port_upkts.inc.php
index 925a87997..0392214aa 100644
--- a/html/includes/graphs/port_upkts.inc.php
+++ b/html/includes/graphs/port_upkts.inc.php
@@ -25,7 +25,7 @@ $colour_area_in_max = "cc88cc";
 $colour_area_out_max = "FFefaa";
 
 $graph_max = 1;
-$unit_text = "Pkts\ \ \ ";
+$unit_text = "Packets";
 
 include("generic_duplex.inc.php");
 
diff --git a/html/pages/customers.php b/html/pages/customers.php
index be676011b..137f04345 100644
--- a/html/pages/customers.php
+++ b/html/pages/customers.php
@@ -42,10 +42,10 @@
     } else { 
      if(isset($prev_customer)) {
        echo("<tr bgcolor='$bg_colour'><td></td><td colspan=6>
-       <img src='http://observer2.as8681.net/graph.php?cust=".rawurlencode($customer)."&type=customer_bits&from=1256573330&to=-300s&width=215&height=100'>
-       <img src='http://observer2.as8681.net/graph.php?cust=".rawurlencode($customer)."&type=customer_bits&from=1256573330&to=-300s&width=215&height=100'>
-       <img src='http://observer2.as8681.net/graph.php?cust=".rawurlencode($customer)."&type=customer_bits&from=1256573330&to=-300s&width=215&height=100'>
-       <img src='http://observer2.as8681.net/graph.php?cust=".rawurlencode($customer)."&type=customer_bits&from=1256573330&to=-300s&width=215&height=100'>
+       <img src='".$config['base_url']."/graph.php?cust=".rawurlencode($customer)."&type=customer_bits&from=1256573330&to=-300s&width=215&height=100'>
+       <img src='".$config['base_url']."/graph.php?cust=".rawurlencode($customer)."&type=customer_bits&from=1256573330&to=-300s&width=215&height=100'>
+       <img src='".$config['base_url']."/graph.php?cust=".rawurlencode($customer)."&type=customer_bits&from=1256573330&to=-300s&width=215&height=100'>
+       <img src='".$config['base_url']."/graph.php?cust=".rawurlencode($customer)."&type=customer_bits&from=1256573330&to=-300s&width=215&height=100'>
        </td></tr>");
      }