Fix a lot of feedback...