I fixed stuffs