few warning fixes; win makefile fixed