more changes
reconnect seems to work now