clients feedback fixes