Add TODOs based on Windows testing
Simplify Makefile for Windows