slight tweaks to build
still fine-tuning
last test, I hope