This paper is dedicated to the memory of John L. Norton, who contributed to the development of computer programs used to calculate single-particle energies and shell and pairing corrections for a deformed folded-Yukawa single-particle potential. The authors present a new set of nuclear mass calculations based on the finite-range droplet macroscopic model and the folded-Yukawa single-particle microscopic model. The results include atomic mass excesses and nuclear ground-state deformations for 8979 nuclei, ranging from $^{16}$O to A = 339. The calculations use an improved macroscopic model, an improved pairing model with a new effective-interaction pairing gap, and include additional shape degrees of freedom. Only 9 constants are determined directly from a least-squares adjustment to the ground-state masses of 1654 nuclei and 28 fission-barrier heights. The error of the mass model is 0.669 MeV for the entire region of nuclei considered, but is only 0.448 MeV for the region above N = 65. The model successfully predicts many nuclear-structure properties, including ground-state masses, deformations, and various decay properties. The model also includes new features such as an eighth-order Strutinsky shell correction, the inclusion of additional shape degrees of freedom, and the calculation of a large number of nuclear ground-state properties. The paper discusses the macroscopic-microscopic finite-range droplet model, including the constants of the model and the adjustment procedure. The model error is defined as the root-mean-square deviation, and the authors use statistical methods to determine the intrinsic model error. The model is applied to calculate nuclear ground-state masses and deformations, and the results are compared with experimental data. The paper also discusses the parameterizations used in the model, including the $ \epsilon $ parameterization and the three-quadratic-surface parameterization, and the conversion to $ \beta $ parameters. The finite-range droplet model is described, including the new exponential term that improves the description of compressibility effects. The paper concludes with the values of the macroscopic-model constants used in the calculations.This paper is dedicated to the memory of John L. Norton, who contributed to the development of computer programs used to calculate single-particle energies and shell and pairing corrections for a deformed folded-Yukawa single-particle potential. The authors present a new set of nuclear mass calculations based on the finite-range droplet macroscopic model and the folded-Yukawa single-particle microscopic model. The results include atomic mass excesses and nuclear ground-state deformations for 8979 nuclei, ranging from $^{16}$O to A = 339. The calculations use an improved macroscopic model, an improved pairing model with a new effective-interaction pairing gap, and include additional shape degrees of freedom. Only 9 constants are determined directly from a least-squares adjustment to the ground-state masses of 1654 nuclei and 28 fission-barrier heights. The error of the mass model is 0.669 MeV for the entire region of nuclei considered, but is only 0.448 MeV for the region above N = 65. The model successfully predicts many nuclear-structure properties, including ground-state masses, deformations, and various decay properties. The model also includes new features such as an eighth-order Strutinsky shell correction, the inclusion of additional shape degrees of freedom, and the calculation of a large number of nuclear ground-state properties. The paper discusses the macroscopic-microscopic finite-range droplet model, including the constants of the model and the adjustment procedure. The model error is defined as the root-mean-square deviation, and the authors use statistical methods to determine the intrinsic model error. The model is applied to calculate nuclear ground-state masses and deformations, and the results are compared with experimental data. The paper also discusses the parameterizations used in the model, including the $ \epsilon $ parameterization and the three-quadratic-surface parameterization, and the conversion to $ \beta $ parameters. The finite-range droplet model is described, including the new exponential term that improves the description of compressibility effects. The paper concludes with the values of the macroscopic-model constants used in the calculations.