Improves builds a bit

It's kinda terrible, but I'm pretty
new to these tools...