binary file fix & others