Initial feedback fixes
Initial fixes (forgot some files)