More stuff I think :/

I fixed it for realz this time.