connection redesign, few fixes