Text this: Psi-Calculi Revisited: Connectivity and Compositionality