run on windows
little cleanups