Fixed translations to be more constant.
Also squash commits that are un-needed
Backwars compat