Add notes regarding current fixes needed