Fix: feedback, templates