fix feedback & minor