Fixes and improvements for makefiles
- Windows makefile is now a template