Updated some files, because apparently I didn't commit all of them in the previous commit