bringing osx and win32 up to date