bug fixes with translation