Finishing touches to client