fix some error, there still have problem