New resource Feedback and lot of small tweaks everywhere