Additional info on connections, code tidyup and a few extra comments