Update strings and get rid of these stupid commits

It's a lot of commits for simply changing minor stuff because git is stupid.