Updated a few broken references
Added automatic reconnection on disconnect