fixed some bugs 1.0