Fixed onConnect resubscription when non subscriptions exist.

Removed manual disconnect and reconnect code from error case in of onConnect

Typos and slight cleanup of variable+constructs