Some minor changes and refactorings to streamline build process
as well as some new/updated dependencies.