fixed some bugs 2.0