fix remarks (part I)