tweaks for Windows, add comments