touchups
touchups
touchups
work on win32 support