fixed feedback and some other stuff