Add useful alternate connect method
Fix crash on disconnect
Style