new feedbacks and some tweaks