fixed some feedback issues, possibly caused some others