More kscope and peer tracking tweaks #302 #448