feedback

I fixed feedback and rebased so there shouldn't be merge conflicts.