fixed up build stuff, almost