Added filename and fixed 1 crash