Fix Feedback and Comment mistakes