tets
Fix many issue
merge