Last changes to the feedback stuff codewise