Fixed some stuff from a merge. I don't know how to use git very well..