Feedback loop fix, and stack overflow work