Added unwrapped2. Fixed MSVC issues.