Lots of tweaks to track connectivity of peers #302