bunch of reconnection fixes
build