dialy work, improve many bugs