Various changes to xConnections.js and controllers