working on windows support
working on windows support
tweaks