Fixed Merge Changes

Various things went wrong with the merging. I fixed them.