fixing for client feedback tweaks