Added TODO stuff.
Updated PeerManager.