some minor changes on the client side