Added unwrapped2. Fixed MSVC issues.
More unwrapped improvements