some work on placement of connectors, etc