tweaks
merge Peer