Changed some mistakes I made with the merge.