A number of maintenance repairs in Budget versions. Prep work beginning for merging into master branch.