Review for translation. Fix issues