diff --git a/060-to-current.sql b/060-to-current.sql
index f6e79a7856..b6b1104a0a 100644
--- a/060-to-current.sql
+++ b/060-to-current.sql
@@ -1,15 +1,3 @@
-ALTER TABLE `interfaces` ADD `pagpOperationMode` VARCHAR( 32 ) NULL;
-ALTER TABLE `interfaces` ADD `pagpPortState` VARCHAR( 16 ) NULL;
-ALTER TABLE `interfaces` ADD `pagpPartnerDeviceId` VARCHAR( 48 ) NULL;
-ALTER TABLE `interfaces` ADD `pagpPartnerLearnMethod` VARCHAR( 16 ) NULL;
-ALTER TABLE `interfaces` ADD `pagpPartnerIfIndex` INT NULL;
-ALTER TABLE `interfaces` ADD `pagpPartnerGroupIfIndex` INT NULL;
-ALTER TABLE `interfaces` ADD `pagpPartnerDeviceName` VARCHAR( 128 ) NULL;
-ALTER TABLE `interfaces` ADD `pagpEthcOperationMode` VARCHAR( 16 ) NULL;
-ALTER TABLE `interfaces` ADD `pagpDeviceId` VARCHAR( 48 ) NULL;
-ALTER TABLE `interfaces` ADD `pagpGroupIfIndex` INT NULL;
-ALTER TABLE `interfaces` ADD `portName` VARCHAR( 128 ) NULL DEFAULT NULL AFTER  `ifName`;
-ALTER TABLE `interfaces` ADD `ifHighSpeed` INT ( 11 ) NULL DEFAULT NULL AFTER  `ifSpeed`;
 ALTER TABLE `mac_accounting` ADD `cipMacHCSwitchedBytes_input` bigint(20) default NULL;
 ALTER TABLE `mac_accounting` ADD `cipMacHCSwitchedBytes_input_prev` bigint(20) default NULL;
 ALTER TABLE `mac_accounting` ADD `cipMacHCSwitchedBytes_input_delta` bigint(20) default NULL;
diff --git a/CHANGELOG b/CHANGELOG
index f0475428d5..38098a4f52 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+Release 0.7 ( Pre-Release )
+
+Changed netstats (icmp, udp, tcp, snmp, ip) stats collection
+Implemented new includes-based graphing system
+Replaced interfaces polling code
+
+Removed or replaced a lot of old and unused code.
+
 Release 0.6.0 ( 28th August 2009 )
 
 Changed IPv6 database structure and discovery *** DATABASE CHANGE ***
diff --git a/addhost.php b/addhost.php
index 868df768a5..1aa80e634d 100755
--- a/addhost.php
+++ b/addhost.php
@@ -25,6 +25,6 @@ if($argv[1] && $argv[2] && $argv[3]) {
       } else { echo("Already got host $host\n"); }
     } else { echo("Could not ping $host\n"); }
   } else { echo("Could not resolve $host\n"); }
-} else { echo("Add Host Tool\nUsage: ./addhost.php <hostname> <community> <snmpversion> <port>\n"); }
+} else { echo("Add Host Tool\nUsage: ./addhost.php <hostname> <community> <snmpversion v1|v2c> <port>\n"); }
 
 ?>
diff --git a/check-errors.php b/check-errors.php
index 2e0af9baf1..e7d441802e 100755
--- a/check-errors.php
+++ b/check-errors.php
@@ -30,6 +30,7 @@ if($errored) { ## If there are errored interfaces
   } 
   ## Send the alert email
   mail($config['email_default'], "Observer detected errors on $i interfaces", $msg, $config['email_headers']);
+  echo($msg);
 }
 
 ?>
diff --git a/html/includes/graphs/multi_bits.inc.php b/html/includes/graphs/multi_bits.inc.php
index d92dda3022..829bb43c4e 100644
--- a/html/includes/graphs/multi_bits.inc.php
+++ b/html/includes/graphs/multi_bits.inc.php
@@ -1,8 +1,9 @@
 <?php
 
-if($_GET['if']) { $interfaces = $_GET['if']; }
+if($_GET['port']) { $interfaces = $_GET['port']; }
 if($_GET['interfaces']) { $interfaces = $_GET['interfaces']; }
 
+
 $i = 1;
 foreach(explode(",", $interfaces) as $ifid) {
   $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `interfaces` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id");
diff --git a/html/pages/device/graphs.inc.php b/html/pages/device/graphs.inc.php
index 9acf0cc5bf..0b3426c04b 100644
--- a/html/pages/device/graphs.inc.php
+++ b/html/pages/device/graphs.inc.php
@@ -144,7 +144,7 @@ while($device = mysql_fetch_array($device_query)) {
       $graph_type = "device_users";            include ("includes/print-device-graph.php");
       echo("<br />");
       echo("<div class=graphhead>Running Processes</div>");
-      $graph_type = "device_procs";            include ("includes/print-device-graph.php");
+      $graph_type = "device_processes";            include ("includes/print-device-graph.php");
       echo("<br />");
       break;
 
diff --git a/html/pages/iftype.php b/html/pages/iftype.php
index 0c378b846d..aeea1cc2c5 100644
--- a/html/pages/iftype.php
+++ b/html/pages/iftype.php
@@ -51,7 +51,7 @@ echo("<table cellpadding=7 cellspacing=0 class=devicetable width=100%>");
 
 if(file_exists($config['rrd_dir'] . "/" . $interface['hostname'] . "/" . $interface['ifIndex'] . ".rrd")) {
 
-    $graph_type = "bits";
+    $graph_type = "port_bits";
     include("includes/print-interface-graphs.inc.php");
 
 }