fix format and filename