fix some remarks