Improved the build process more, w/ better "macros"