addressed compiler issues on windows (mostly)