Improving the client commands somewhat