Feedback and fixes