Updated TODO.
Adjustments for MSVC.