fix issue and add language variables