Connect & Messages + Some cleanups
Merge