Pulled tracking out of ErrorDialog, added auto-reconnect and additional tracking