fix some according to reuirements