enhancements on the server/client demo