I fixed some bugs