more cr feedback

Auditors: blackmad