some bugs solved