fixed a whole bunch of client side stuff