fix all remarks