Fixed bugs, one translation to go