clean up SWIG and updates for MSVC