added minor templating to client