bug fixes on feedbacks.