fix some bugs ,still testing