fix bug and adding language opt