new connection strategy
minor fixes