Some fixes
Fixed reconnect behaviour
Link on reconnect