Add a simple client, fix embarassing bug