Fix typos, behaivour of safed files