Final modifications, with comments, to files