Fixed some problems from merging

I HAVE NO IDEA WHAT I’M DOING WITH MERGING GAH