a little fix in client logic
some more fixes