---fixed name and jpg->png