resolve the issues
small changes