Client: Small corrections