Issue 374 & Reconnect Issues

Corrects Issue 374, and fixes several other issues discovered while fixing 374 that caused connections to fail if a DGI was disconnected or restarted.