started on fixing compile errors with MSVC