fixed: some lang issues