Fix nasty circular import that cause vicious random crash
translation fix and update