Implemented feedback fixes