feedback fixes
feedback fixes