fix many problem