Major cleanup to build script
Minor tweak to the custom format dialog