tweaked a few things, need to test on windows