Work to modernize build.
Updates to build.