fixed all remarks