Fixed stuff that got messed up in merging

Fixed some things that didn't merge right