added some stuff to client side and added a bit to server