added windows run support, still a few issues