review feedback fixes