More handling of peers from controller #302 #448