Improved whitelist import.  Optimizations.  Renaming heartbeat