fixes to Data, Connector; todo sample