Some improvements to our File class.