consistency improvements and added new clients