Remarks fixes