More updates in peer code.