complete connectRegistry. Also minor updates and fixes