error hand corrections + method rename for files