adding timeout to peers, and fixing things