More feedback fixes
Model fixes