feedback 12 & 13 fixes