Updates to server and client scripts