Tried to fix up the Makefile a bit. Hopefully, the issues with building on Windows will stop