improve peer parsing