Tidy up the information for the new connect method.
Added support for clientId being passed in as a query param.