consolidated feedback fixes