Some work on Windows tap.
A bit of code comment cleanup.