some more client changes