fix format and missing strings