fix client stuff
merge