Moved connector caps around; updated connectors