Final fixes to feedback feature