some bugs solved.