diff --git a/associate.php b/associate.php
index 5dfc83e..492e45f 100755
--- a/associate.php
+++ b/associate.php
@@ -23,7 +23,7 @@ $message = "";
 
 
   function csv_filter($value) {
-    return preg_replace('/[^a-z0-9:]/i','',$value);
+    return preg_replace('/[^a-z0-9: ]/i','',$value);
   }
 
   function is_mac($mac) {
@@ -63,7 +63,7 @@ include('header-inc.php');
         <table>
           <tr><td><label for="name">Your Name:</label></td><td><input type="text" id="name" name="name" /></td></tr>
           <tr><td><label for="macaddress">MAC Address:</label></td><td><input type="text" id="macaddress" name="macaddress" value="<?php echo arp_lookup($_SERVER['REMOTE_ADDR']); ?>" />
-            <span id="autodetect"><?php if($arp_found) { echo "(Autodetected MAC from IP address ".$_SERVER['REMOTE_ADDR'].")"; } ?></span>
+            <span id="autodetect"><?php if($arp_found) { echo "(Autodetected your MAC from IP address ".$_SERVER['REMOTE_ADDR'].")"; } ?></span>
           </td></tr>
         </table>
         <input type="submit" id="submit" name="submit" value="Register" />
diff --git a/index.php b/index.php
index fe675db..239964b 100644
--- a/index.php
+++ b/index.php
@@ -4,7 +4,7 @@ include('header-inc.php');
 
 
 $result = http_parse_message(http_get("http://localhost/pamela/data.php"));
-$result = preg_replace("/\s/","",$result->body); // get rid of linebreaks
+$result = preg_replace("/[\r|\n]/","",$result->body); // get rid of linebreaks
 
 $decode = json_decode($result);
 $decode = preg_replace("/^([0-9a-f]{2}([:]|$)){6}$/i",'{$0}',$decode);
@@ -16,12 +16,20 @@ echo "<h2>Who's here right now?</h2>";
 echo "<ul>";
 foreach($array as $entry) {
   if(substr($entry,0,1) == "{") {
-    echo "<li class='macaddr'>".$entry."</li>";
+    if($_GET['showmacs'] == "1") {
+      echo "<li class='macaddr'>".$entry."</li>";
+    }
   }
   else{
     echo "<li>".$entry."</li>";
   }
 }
+if($_GET['showmacs'] == "1") {
+  echo "<li>&nbsp;<br/><a href=\"?showmacs=0\">Hide people who haven't registered yet</a>";
+}
+else {
+  echo "<li>&nbsp;<br/><a href=\"?showmacs=1\">Show people who haven't registered yet</a>";
+}
 echo "</ul>";
 
 ?>
diff --git a/pamela/scanner/pamela-scanner.sh b/pamela/scanner/pamela-scanner.sh
index f3e0e65..92632a3 100755
--- a/pamela/scanner/pamela-scanner.sh
+++ b/pamela/scanner/pamela-scanner.sh
@@ -201,5 +201,3 @@ scan
 translate
 upload
 
-git commit mac_log.csv -m "Save updates user database"
-