remove one fwd decl, add more comments to Connection