bug fix, stability, reconnect (mostly)