fixed some lang issues