Some stuff I fixed