yet more comparing files to fix bugs