further simplifications based on bad c++
updated Makefile for Windows