improved new connection setup and improved collison fix handler