fixed interface for win/lin, fixed Makefiles