finished fixing most of the feedback