client fixes
merges