fix + better filename recog