+refactoring
tweak for Win64