minor refactors
landing connect