I fixed a few bugs