Added a client script and fixed a few things