Bug fixing, feeds state persistence