add language codes
use language codes to construct friendly name
fix tests