Cleaning up implementation; fixing last minute issues in the sample. Now working under Win32 again