Fix & add some comments for win32