Small code cleanups.  Proximity.csv still not loading properly, investigating...