Finish basic version improvements - two peers