diff --git a/html/data.php b/html/data.php
index 21be997e72..4c53752cf1 100644
--- a/html/data.php
+++ b/html/data.php
@@ -1,11 +1,6 @@
 <?php
 
-#  $debug = TRUE;
-#  ini_set('display_errors', 1);
-#  ini_set('display_startup_errors', 0);
-#  ini_set('log_errors', 0);
-#  ini_set('error_reporting', E_ALL);
-
+## FIXME - fewer includes!
 
 include_once("../includes/defaults.inc.php");
 include_once("../config.php");
diff --git a/html/includes/graphs/device/bits.inc.php b/html/includes/graphs/device/bits.inc.php
index 8e113c7a42..0bd5ebaa49 100644
--- a/html/includes/graphs/device/bits.inc.php
+++ b/html/includes/graphs/device/bits.inc.php
@@ -50,7 +50,6 @@ $colours_out = 'blues';
 
 $nototal = 1;
 
-
 $ds_in  = "INOCTETS";
 $ds_out = "OUTOCTETS";
 
diff --git a/html/includes/graphs/generic_multi_bits_separated.inc.php b/html/includes/graphs/generic_multi_bits_separated.inc.php
index 575b2b36a5..efaeb09970 100644
--- a/html/includes/graphs/generic_multi_bits_separated.inc.php
+++ b/html/includes/graphs/generic_multi_bits_separated.inc.php
@@ -12,15 +12,14 @@ if($width > "500")
 }
 
 $unit_text = "Bits/sec";
-$rrd_options  .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)."'";
 
 if($width > "500")
 {
-  $rrd_options .= " COMMENT:'    Current      Average     Maximum      '";
+  $rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)."    Current      Average     Maximum      '";
   if (!$nototal) { $rrd_options .= " COMMENT:'Total      '"; }
   $rrd_options .= " COMMENT:'\l'";
 } else {
-  $rrd_options .= " COMMENT:'     Now         Ave          Max\l'";
+  $rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)."     Now         Ave          Max\l'";
 
 }
 
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 825df2af71..e878820d1d 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -82,7 +82,9 @@ $config['discover_services']              = false; ## Autodiscover services via
 
 $config['alerts']['email']['default']      = NULL;    ## Default alert recipient
 $config['alerts']['email']['default_only'] = FALSE;   ## Only use default recipient
-$config['alerts']['email']['enable']           = TRUE;    ## Enable email alerts
+$config['alerts']['email']['enable']       = TRUE;    ## Enable email alerts
+$config['alerts']['bgp']['whitelist']	   = NULL;    ## Populate as an array() with ASNs to alert on.
+
 $config['uptime_warning']                  = "84600"; ## Time in seconds to display a "Device Rebooted" Alert. 0 to disable warnings.
 
 ### Cosmetics
diff --git a/includes/polling/bgp-peers.inc.php b/includes/polling/bgp-peers.inc.php
index 13603d6aaa..6367f0b2af 100755
--- a/includes/polling/bgp-peers.inc.php
+++ b/includes/polling/bgp-peers.inc.php
@@ -83,7 +83,7 @@ else
 
     if ($bgpPeerFsmEstablishedTime)
     {
-      if ($bgpPeerFsmEstablishedTime < $peer['bgpPeerFsmEstablishedTime'] || $bgpPeerState != $peer['bgpPeerState'])
+      if (!(is_array($config['alerts']['bgp']['whitelist']) && in_array($bgppeerremoteas, $config['alerts']['peer_whitelist'])) && ($bgpPeerFsmEstablishedTime < $peer['bgpPeerFsmEstablishedTime'] || $bgpPeerState != $peer['bgpPeerState']))
       {
         if ($peer['bgpPeerState'] == $bgpPeerState)
         {