Feedback and some fixes.