better client reconnect + small fixes