fix some client side stuff