diff --git a/check-services.php b/check-services.php
index b2d0bf31e..0c6784c26 100755
--- a/check-services.php
+++ b/check-services.php
@@ -18,6 +18,7 @@ while ($service = mysql_fetch_array($query)) {
     $status = "2";
     $check = "Error : Script not found ($checker_script)";
   }
+<<<<<<< .mine
   if($service_status != $status) { 
     $updated = ", `service_changed` = '" . time() . "' "; 
     if($service['sysContact']) { $email = $service['sysContact']; } else { $email = $config['email_default']; }
@@ -31,6 +32,23 @@ while ($service = mysql_fetch_array($query)) {
         mail($email, "Service Down: " . $service['service_type'] . " on " . $service['hostname'], $msg, $config['email_headers']);
     }
 
+  } else { unset($updated); }
+  mysql_query("UPDATE `services` SET `service_status` = '$status', `service_message` = '$check', `service_checked` = '" . time() . "' $updated WHERE `service_id` = '$service[service_id]'");
+=======
+  if($service_status != $status) { 
+    $updated = ", `service_changed` = '" . time() . "' "; 
+    if($service['sysContact']) { $email = $service['sysContact']; } else { $email = $config['email_default']; }
+    if($status == "1") {
+        $msg  = "Service Up: " . $service['service_type'] . " on " . $service['hostname'];
+        $msg .= " at " . date('l dS F Y h:i:s A');
+	mail($email, "Service Up: " . $service['service_type'] . " on " . $service['hostname'], $msg, $config['email_headers']);
+    } elseif ($status == "0") {
+	$msg  = "Service Down: " . $service['service_type'] . " on " . $service['hostname'];
+        $msg .= " at " . date('l dS F Y h:i:s A');
+        mail($email, "Service Down: " . $service['service_type'] . " on " . $service['hostname'], $msg, $config['email_headers']);
+    }
+>>>>>>> .r121
+
   } else { unset($updated); }
   $update_sql = "UPDATE `services` SET `service_status` = '$status', `service_message` = '" . addslashes($check) . "', `service_checked` = '" . time() . "' $updated WHERE `service_id` = '" . $service['service_id']. "'";
   mysql_query($update_sql);
diff --git a/html/includes/print-interface.inc b/html/includes/print-interface.inc
index 2cead4f6f..fe353e0e1 100644
--- a/html/includes/print-interface.inc
+++ b/html/includes/print-interface.inc
@@ -46,8 +46,10 @@
     $in_perc = @round($interface['in_rate']/$interface['ifSpeed']*100);
     $out_perc = @round($interface['in_rate']/$interface['ifSpeed']*100);
    
-    echo("<img src='/images/16/arrow_left.png' align=absmiddle> <span style='color: " . percent_colour($in_perc) . "'>" . formatRates($interface['in_rate']) . "</span><br />");
-    echo("<img align=absmiddle src='/images/16/arrow_out.png'> <span style='color: " . percent_colour($out_perc) . "'>" . formatRates($interface['out_rate']) . "</span>");
+    echo("<img src='/images/16/arrow_left.png' align=absmiddle> <span style='color: " . percent_colour($in_perc) . "'>" . 
+      formatRates($interface['in_rate']) . "</span><br />");
+    echo("<img align=absmiddle src='/images/16/arrow_out.png'> <span style='color: " . percent_colour($out_perc) . "'>" . 
+      formatRates($interface['out_rate']) . "</span>");
     
   }
   echo("</td><td width=70>");
diff --git a/html/pages/customers.php b/html/pages/customers.php
index d28a50538..52077dac1 100644
--- a/html/pages/customers.php
+++ b/html/pages/customers.php
@@ -36,12 +36,21 @@
     }
     $previfalias = $device['ifAlias'];
 
+    if($device['os'] == "IOS") {
+
+      if($interface['ifTrunk']) { $vlan = "<span class=box-desc><span class=red>" . $interface['ifTrunk'] . "</span></span>";
+      } elseif ($interface['ifVlan']) { $vlan = "<span class=box-desc><span class=blue>VLAN " . $interface['ifVlan'] . "</span></span>"; 
+      } else { $vlan = ""; }
+
+    }
+
     echo("
            <tr bgcolor='$bg'>
              <td width='7'></td>
              <td width='250'><span style='font-weight: bold;' class=interface>$useifalias</span></td>
              <td width='200'>" . generatedevicelink($device) . "</td>
              <td width='100'>" . generateiflink($interface, makeshortif($interface['ifDescr'])) . "</td>
+             <td width='100'>$vlan</td>
              <td>$notes</td>
            </tr>
          ");