fix format and missing strings
fix format and missing strings