I fixed some bugs and errors