Apply feedback & polish