minor updates; fixed labels in connector and scope; need to strip scope more: