diff --git a/VolunteerGrid.md b/VolunteerGrid.md
index f491a71..428a8e8 100644
--- a/VolunteerGrid.md
+++ b/VolunteerGrid.md
@@ -30,14 +30,14 @@ In the unfortunate case where the current introducer disappear, the following pe
 
 ## Storage Nodes
 
-| | | |
-|---|---|---|
-| **Name** **Admin contact** | **Location** | **Notes/Status** |
+| | | | |
+|---|---|---|---|
+| **Name** | **Admin contact** | **Location** | **Notes/Status** |
 | de.struc.tv | ?? | ?? |
 | francois1(at)tahoe.ctrlaltdel.ch | francois(at)ctrlaltdel.ch | Lausanne, Switzerland |
 | imp-ap01 | IRC: ndurner | Germany |
 | Kim | ?? | ?? |
-| kpreid@eider | kpreid@``````mac.com | USA |
+| kpreid@eider | kpreid@``````switchb.org | USA |
 | ndurdner | IRC: ndurner | Germany |
 | SECORP_DOT_NET_<01-04> | IRC: secorp | ?? |
 | trelbox | IRC: terrell/trel1023 | Chapel Hill, NC, USA |
@@ -52,7 +52,7 @@ In the unfortunate case where the current introducer disappear, the following pe
 | **Name** | **Admin contact** | **Last Location** | **Notes/Status** |
 | draco (Zooko's Mac/PPC 867 MHz laptop) | IRC: zooko / zooko(at)zooko.com | Valhalla |
 | aogail-volunteergrid @ tigard.w007.org | allmydata  (at) w007.org | Tigard, OR, USA |
-| kpreid@slimy | kpreid@``````mac.com | USA |
+| kpreid@slimy | kpreid@``````switchb.org | USA |
 | ootles (Zooko's Macbook Pro Intel Core 2 Duo laptop) | IRC: zooko / zooko(at)zooko.com | Boulder, CO, USA |
 | `Toes' on verterok.endoftheinternet.org | wilcoxjg(at)gmail.com | CA, USA | Not seen since introducer change 2009-12-11 |
 | `Vapor' on 74.207.243.100 | wilcoxjg(at)gmail.com | CA, USA |