some more client side improvements