fixing comments and filenames