Fix a couple of issues allowing the user to catch connection issues.
Update deps
tidy