Client Context Menu & minor sync bugs - v6