many bug fixed :heart: