fixed some mistakes(not the update for 2.0.0)