commit for fix many issues