more work on safefile -- it was STILL too pissy