small changes, easier compiling under windows