Fixing some bugs adding support for the feedback