feedback: Simplify stage feedback
feedback: Fix various logic errors