some lang fixes