diff --git a/Src/VimCore/CaretChangeTracker.fs b/Src/VimCore/CaretChangeTracker.fs
index e2e2f1e8dc..a800b2b526 100644
--- a/Src/VimCore/CaretChangeTracker.fs
+++ b/Src/VimCore/CaretChangeTracker.fs
@@ -6,11 +6,14 @@ open System.ComponentModel.Composition
 /// Ensure view properties after external caret events
 type internal CaretChangeTracker
     ( 
-        _vimBuffer: IVimBuffer,
-        _commonOperations: ICommonOperations,
-        _mouseDevice: IMouseDevice
+        vimBuffer: IVimBuffer,
+        commonOperations: ICommonOperations,
+        mouseDevice: IMouseDevice
     ) as this =
 
+    let _vimBuffer = vimBuffer
+    let _commonOperations = commonOperations
+    let _mouseDevice = mouseDevice
     let _globalSettings = _vimBuffer.GlobalSettings
     let _textView = _vimBuffer.TextView
     let _vimHost = _vimBuffer.Vim.VimHost
diff --git a/Src/VimCore/FSharpUtil.fs b/Src/VimCore/FSharpUtil.fs
index 421b637b5d..7bbd28a746 100644
--- a/Src/VimCore/FSharpUtil.fs
+++ b/Src/VimCore/FSharpUtil.fs
@@ -660,16 +660,16 @@ module CharUtil =
 /// The .Net mapping for the keys defined in :help key-notation
 module internal CharCodes =
 
-    /// <Nul> 
+    /// Nul key
     let Zero = char 0
 
-    /// <CR> / <Return> / <Enter>
+    /// CR / Return / Enter key
     let Enter = CharUtil.OfAsciiValue 13uy
 
-    /// <ESC>
+    /// ESC key
     let Escape = CharUtil.OfAsciiValue 27uy
 
-    /// <BS> 
+    /// BS key
     let Backspace = '\b'
 
 module internal StringBuilderExtensions =
diff --git a/Src/VimCore/HistoryUtil.fs b/Src/VimCore/HistoryUtil.fs
index 972293212c..7fa7982f69 100644
--- a/Src/VimCore/HistoryUtil.fs
+++ b/Src/VimCore/HistoryUtil.fs
@@ -284,7 +284,7 @@ and internal HistoryUtil ()  =
 
     static member KeyInputMap = _keyInputMap
 
-    static member CreateHistorySession<'TData, 'TResult> historyClient clientData command localAbbreviationMap motionUtil =
-        let historySession = HistorySession<'TData, 'TResult>(historyClient, clientData, command, localAbbreviationMap, motionUtil)
+    static member CreateHistorySession<'TData, 'TResult> historyClient initialClientData command localAbbreviationMap motionUtil =
+        let historySession = HistorySession<'TData, 'TResult>(historyClient, initialClientData, command, localAbbreviationMap, motionUtil)
         historySession :> IHistorySession<'TData, 'TResult>
 
diff --git a/Src/VimCore/HistoryUtil.fsi b/Src/VimCore/HistoryUtil.fsi
index 3e6169819b..e2af181250 100644
--- a/Src/VimCore/HistoryUtil.fsi
+++ b/Src/VimCore/HistoryUtil.fsi
@@ -6,7 +6,7 @@ namespace Vim
 type internal HistoryUtil = 
 
     /// Begin a history related operation
-    static member CreateHistorySession<'TData, 'TResult> : IHistoryClient<'TData, 'TResult> -> initialData: 'TData -> editableCommand: EditableCommand -> localAbbreviationMap: IVimLocalAbbreviationMap -> motionUtil: IMotionUtil -> IHistorySession<'TData, 'TResult>
+    static member CreateHistorySession<'TData, 'TResult> : IHistoryClient<'TData, 'TResult> -> initialClientData: 'TData -> command: EditableCommand -> localAbbreviationMap: IVimLocalAbbreviationMap -> motionUtil: IMotionUtil -> IHistorySession<'TData, 'TResult>
 
     /// The set of KeyInput values which history considers to be a valid command
     static member CommandNames: KeyInput list
diff --git a/Src/VimCore/IncrementalSearch.fs b/Src/VimCore/IncrementalSearch.fs
index 97412de709..6242eb5188 100644
--- a/Src/VimCore/IncrementalSearch.fs
+++ b/Src/VimCore/IncrementalSearch.fs
@@ -289,20 +289,17 @@ type internal IncrementalSearchSession
 
 type internal IncrementalSearch
     (
-        _vimBufferData: IVimBufferData,
-        _operations: ICommonOperations,
-        _motionUtil: IMotionUtil
+        vimBufferData: IVimBufferData,
+        commonOperations: ICommonOperations,
+        motionUtil: IMotionUtil
     ) =
 
-    // TODO: most of these aren't needed anymore.
-    let _vimData = _vimBufferData.Vim.VimData
-    let _statusUtil = _vimBufferData.StatusUtil
+    let _vimBufferData = vimBufferData
+    let _operations = commonOperations
+    let _motionUtil = motionUtil
     let _vimTextBuffer = _vimBufferData.VimTextBuffer
     let _wordNavigator = _vimTextBuffer.WordNavigator
-    let _localSettings = _vimTextBuffer.LocalSettings
-    let _globalSettings = _localSettings.GlobalSettings
-    let _textView = _operations.TextView
-    let _searchService = _vimBufferData.Vim.SearchService
+    let _globalSettings = _vimTextBuffer.GlobalSettings
 
     let mutable _session: IncrementalSearchSession option = None
     let _sessionCreated = StandardEvent<IncrementalSearchSessionEventArgs>()
diff --git a/Src/VimCore/Interpreter_Parser.fs b/Src/VimCore/Interpreter_Parser.fs
index 2daf4addb0..48407f6d3d 100644
--- a/Src/VimCore/Interpreter_Parser.fs
+++ b/Src/VimCore/Interpreter_Parser.fs
@@ -108,10 +108,12 @@ and LineCommandBuilder
 
 and [<Sealed>] internal Parser
     (
-        _globalSettings: IVimGlobalSettings,
-        _vimData: IVimData
+        globalSettings: IVimGlobalSettings,
+        vimData: IVimData
     ) as this = 
 
+    let _globalSettings = globalSettings
+    let _vimData = vimData
     let _parseResultBuilder = ParseResultBuilder(this)
     let _lineCommandBuilder = LineCommandBuilder(this)
     let _tokenizer = Tokenizer("", TokenizerFlags.None)
@@ -460,14 +462,14 @@ and [<Sealed>] internal Parser
 
     /// Try and expand the possible abbreviation to a full line command name.  If it's 
     /// not an abbreviation then the original string will be returned
-    member x.TryExpandCommandName name =
+    member x.TryExpandCommandName shortCommandName =
 
-        // Is 'name' an abbreviation of the given command name and abbreviation
+        // Is 'shortCommandName' an abbreviation of the given command name and abbreviation
         let isAbbreviation (fullName: string) (abbreviation: string) = 
-            if name = fullName then
+            if shortCommandName = fullName then
                 true
             else 
-                name.StartsWith(abbreviation) && fullName.StartsWith(name)
+                shortCommandName.StartsWith(abbreviation) && fullName.StartsWith(shortCommandName)
 
         s_LineCommandNamePair
         |> Seq.filter (fun (name, abbreviation) -> isAbbreviation name abbreviation)
diff --git a/Src/VimCore/Interpreter_Parser.fsi b/Src/VimCore/Interpreter_Parser.fsi
index 89900a8e55..9a342bec0d 100644
--- a/Src/VimCore/Interpreter_Parser.fsi
+++ b/Src/VimCore/Interpreter_Parser.fsi
@@ -12,9 +12,9 @@ type internal ParseResult<'T> =
 [<Class>]
 type internal Parser = 
 
-    new: vimData: IVimGlobalSettings * IVimData -> Parser
+    new: globalSettings: IVimGlobalSettings * vimData: IVimData -> Parser
 
-    new: vimData: IVimGlobalSettings * IVimData * lines: string[] -> Parser
+    new: globalSettings: IVimGlobalSettings * vimData: IVimData * lines: string[] -> Parser
 
     member IsDone: bool
 
diff --git a/Src/VimCore/Interpreter_Tokenizer.fs b/Src/VimCore/Interpreter_Tokenizer.fs
index 9286775c7b..f3c89706d1 100644
--- a/Src/VimCore/Interpreter_Tokenizer.fs
+++ b/Src/VimCore/Interpreter_Tokenizer.fs
@@ -193,10 +193,12 @@ type internal TokenStream() =
 [<DebuggerDisplay("{ToString(),nq}")>]
 type internal Tokenizer
     (
-        _text: string,
-        _tokenizerFlags: TokenizerFlags
+        text: string,
+        tokenizerFlags: TokenizerFlags
     ) as this =
 
+    let _text = text
+    let _tokenizerFlags = tokenizerFlags
     let _tokenStream = TokenStream()
     let mutable _text = _text
     let mutable _tokenizerFlags = _tokenizerFlags
diff --git a/Src/VimCore/KeyInput.fs b/Src/VimCore/KeyInput.fs
index c65c2e58de..beb579ebcc 100644
--- a/Src/VimCore/KeyInput.fs
+++ b/Src/VimCore/KeyInput.fs
@@ -37,18 +37,18 @@ type KeyInput
     /// This is demonstratable in a couple of areas.  One simple one is using the 
     /// the CTRL-F command (scroll down).  It has the same behavior with capital 
     /// or lower case F.
-    member x.CompareTo (right: KeyInput) =
-        if obj.ReferenceEquals(right, null) then
+    member x.CompareTo (other: KeyInput) =
+        if obj.ReferenceEquals(other, null) then
             1
         else 
             let left = x
-            let comp = compare left.KeyModifiers right.KeyModifiers
+            let comp = compare left.KeyModifiers other.KeyModifiers
             if comp <> 0 then 
                 comp
             else
-                let comp = compare left.Char right.Char
+                let comp = compare left.Char other.Char
                 if comp <> 0 then comp
-                else compare left.Key right.Key
+                else compare left.Key other.Key
                     
     override x.GetHashCode() = 
         HashUtil.Combine3 (x.Char.GetHashCode()) (x.Key.GetHashCode()) (x.KeyModifiers.GetHashCode())
@@ -309,8 +309,8 @@ module KeyInputUtil =
         | None -> invalidArg "vimKey" Resources.KeyInput_InvalidVimKey
         | Some(ki) -> ki
 
-    let ChangeKeyModifiersDangerous (ki:KeyInput) keyModifiers = 
-        KeyInput(ki.Key, keyModifiers, ki.RawChar)
+    let ChangeKeyModifiersDangerous (keyInput: KeyInput) modifiers = 
+        KeyInput(keyInput.Key, modifiers, keyInput.RawChar)
 
     let NullKey = VimKeyToKeyInput VimKey.Null
     let LineFeedKey = VimKeyToKeyInput VimKey.LineFeed
@@ -321,7 +321,7 @@ module KeyInputUtil =
     /// Apply the modifiers to the given KeyInput and determine the result.  This will
     /// not necessarily return a KeyInput with the modifier set.  It attempts to unify 
     /// certain ambiguous combinations.
-    let ApplyKeyModifiers (keyInput: KeyInput) (targetModifiers: VimKeyModifiers) =
+    let ApplyKeyModifiers (keyInput: KeyInput) (modifiers: VimKeyModifiers) =
 
         let normalizeToUpper (keyInput: KeyInput) =
             match keyInput.RawChar with
@@ -395,9 +395,9 @@ module KeyInputUtil =
                         let modifiers = Util.UnsetFlag keyInput.KeyModifiers VimKeyModifiers.Control
                         ChangeKeyModifiersDangerous keyInput modifiers
 
-        let keyInput = ChangeKeyModifiersDangerous keyInput (targetModifiers ||| keyInput.KeyModifiers)
+        let keyInput = ChangeKeyModifiersDangerous keyInput (modifiers ||| keyInput.KeyModifiers)
 
-        if Util.IsFlagSet targetModifiers VimKeyModifiers.Alt then
+        if Util.IsFlagSet modifiers VimKeyModifiers.Alt then
 
             // The alt key preserves all modifiers and converts the char to uppercase.
             normalizeToUpper keyInput
@@ -406,14 +406,14 @@ module KeyInputUtil =
 
             // First normalize the shift case.
             let keyInput = 
-                if Util.IsFlagSet targetModifiers VimKeyModifiers.Shift then
+                if Util.IsFlagSet modifiers VimKeyModifiers.Shift then
                     normalizeShift keyInput
                 else 
                     keyInput
 
             // Next normalize the control case.
             let keyInput = 
-                if Util.IsFlagSet targetModifiers VimKeyModifiers.Control then
+                if Util.IsFlagSet modifiers VimKeyModifiers.Control then
                     normalizeControl keyInput
                 else
                     keyInput
diff --git a/Src/VimCore/KeyInput.fsi b/Src/VimCore/KeyInput.fsi
index e481989ba8..26f7c472a9 100644
--- a/Src/VimCore/KeyInput.fsi
+++ b/Src/VimCore/KeyInput.fsi
@@ -106,10 +106,10 @@ module KeyInputUtil =
     val CharToKeyInput: c: char -> KeyInput
 
     /// Convert the passed in char to a KeyInput with Control
-    val CharWithControlToKeyInput: c: char -> KeyInput
+    val CharWithControlToKeyInput: ch: char -> KeyInput
 
     /// Convert the passed in char to a KeyInput with Alt
-    val CharWithAltToKeyInput: c: char -> KeyInput
+    val CharWithAltToKeyInput: ch: char -> KeyInput
 
     /// Convert the specified VimKey code to a KeyInput 
     val VimKeyToKeyInput: vimKey: VimKey -> KeyInput
diff --git a/Src/VimCore/KeyMap.fs b/Src/VimCore/KeyMap.fs
index fe95923ae8..8f8bd55e10 100644
--- a/Src/VimCore/KeyMap.fs
+++ b/Src/VimCore/KeyMap.fs
@@ -206,8 +206,9 @@ type Mapper
 
         result.Value
 
-type internal GlobalKeyMap(_variableMap: VariableMap) =
+type internal GlobalKeyMap(variableMap: VariableMap) =
 
+    let _variableMap = variableMap
     let _map = MappingMap<KeyRemapMode, KeyMapping>(KeyRemapMode.All)
 
     static member ParseKeyNotation(notation: string, variableMap: VariableMap) =
@@ -236,11 +237,14 @@ type internal GlobalKeyMap(_variableMap: VariableMap) =
 
 type internal LocalKeyMap
     (
-        _globalKeyMap: IVimGlobalKeyMap,
-        _globalSettings: IVimGlobalSettings,
-        _variableMap: VariableMap
+        globalKeyMap: IVimGlobalKeyMap,
+        globalSettings: IVimGlobalSettings,
+        variableMap: VariableMap
     ) =
 
+    let _globalKeyMap = globalKeyMap
+    let _globalSettings = globalSettings
+    let _variableMap = variableMap
     let _map = MappingMap<KeyRemapMode, KeyMapping>(KeyRemapMode.All)
     let mutable _isZeroMappingEnabled = true
 
@@ -310,11 +314,14 @@ type internal GlobalAbbreviationMap() =
 
 type internal LocalAbbreviationMap
     (
-        _keyMap: IVimLocalKeyMap,
-        _globalAbbreviationMap: IVimGlobalAbbreviationMap,
-        _wordUtil : WordUtil
+        keyMap: IVimLocalKeyMap,
+        globalAbbreviationMap: IVimGlobalAbbreviationMap,
+        wordUtil : WordUtil
     ) = 
 
+    let _keyMap = keyMap
+    let _globalAbbreviationMap = globalAbbreviationMap
+    let _wordUtil = wordUtil
     let _map = MappingMap<AbbreviationMode, Abbreviation>(AbbreviationMode.All)
 
     member x.Map = _map
diff --git a/Src/VimCore/ModeLineInterpreter.fs b/Src/VimCore/ModeLineInterpreter.fs
index 0aaec934e6..6a1919600f 100644
--- a/Src/VimCore/ModeLineInterpreter.fs
+++ b/Src/VimCore/ModeLineInterpreter.fs
@@ -9,10 +9,13 @@ open Microsoft.VisualStudio.Text
 [<Class>]
 type internal ModeLineInterpreter
     (
-        _textBuffer: ITextBuffer,
-        _localSettings: IVimLocalSettings
+        textBuffer: ITextBuffer,
+        localSettings: IVimLocalSettings
     ) =
 
+    let _textBuffer = textBuffer
+    let _localSettings = localSettings
+
     /// Regular expressions to parse the modeline
     static let _escapedModeLine = @"(([^:\\]|\\:?)*)"
     static let _firstFormRegex = new Regex(@"[ \t]vim:(.*)$", RegexOptions.Compiled)
diff --git a/Src/VimCore/MultiSelectionTracker.fs b/Src/VimCore/MultiSelectionTracker.fs
index cdf96637a9..fd0c7d76a1 100644
--- a/Src/VimCore/MultiSelectionTracker.fs
+++ b/Src/VimCore/MultiSelectionTracker.fs
@@ -7,11 +7,14 @@ open Microsoft.VisualStudio.Text.Editor
 
 type internal MultiSelectionTracker
     ( 
-        _vimBuffer: IVimBuffer,
-        _commonOperations: ICommonOperations,
-        _mouseDevice: IMouseDevice
+        vimBuffer: IVimBuffer,
+        commonOperations: ICommonOperations,
+        mouseDevice: IMouseDevice
     ) as this =
 
+    let _vimBuffer = vimBuffer
+    let _commonOperations = commonOperations
+    let _mouseDevice = mouseDevice
     let _globalSettings = _vimBuffer.GlobalSettings
     let _localSettings = _vimBuffer.LocalSettings
     let _vimBufferData = _vimBuffer.VimBufferData
diff --git a/Src/VimCore/SelectionChangeTracker.fs b/Src/VimCore/SelectionChangeTracker.fs
index a52e5929de..df506f0a7e 100644
--- a/Src/VimCore/SelectionChangeTracker.fs
+++ b/Src/VimCore/SelectionChangeTracker.fs
@@ -17,12 +17,16 @@ open System.Collections.Generic
 /// inside on
 type internal SelectionChangeTracker
     ( 
-        _vimBuffer: IVimBuffer,
-        _commonOperations: ICommonOperations,
-        _selectionOverrideList: IVisualModeSelectionOverride list,
-        _mouseDevice: IMouseDevice
+        vimBuffer: IVimBuffer,
+        commonOperations: ICommonOperations,
+        selectionOverrideList: IVisualModeSelectionOverride list,
+        mouseDevice: IMouseDevice
     ) as this =
 
+    let _vimBuffer = vimBuffer
+    let _commonOperations = commonOperations
+    let _selectionOverrideList = selectionOverrideList
+    let _mouseDevice = mouseDevice
     let _globalSettings = _vimBuffer.GlobalSettings
     let _textView = _vimBuffer.TextView
     let _vimHost = _vimBuffer.Vim.VimHost
diff --git a/Src/VimCore/SelectionChangeTracker.fsi b/Src/VimCore/SelectionChangeTracker.fsi
index f751cf3188..3194287967 100644
--- a/Src/VimCore/SelectionChangeTracker.fsi
+++ b/Src/VimCore/SelectionChangeTracker.fsi
@@ -3,4 +3,4 @@
 namespace Vim
 
 type internal SelectionChangeTracker =
-    new: vimBuffer: IVimBuffer * commonOperations: ICommonOperations * visualModeSelectionOverrideList: IVisualModeSelectionOverride list * mouseDevice: IMouseDevice -> SelectionChangeTracker
+    new: vimBuffer: IVimBuffer * commonOperations: ICommonOperations * selectionOverrideList: IVisualModeSelectionOverride list * mouseDevice: IMouseDevice -> SelectionChangeTracker
diff --git a/Src/VimCore/TextObjectUtil.fs b/Src/VimCore/TextObjectUtil.fs
index f5a13a2353..49711d13d8 100644
--- a/Src/VimCore/TextObjectUtil.fs
+++ b/Src/VimCore/TextObjectUtil.fs
@@ -44,10 +44,13 @@ type internal SectionKind =
 
 type internal TextObjectUtil
     (
-        _globalSettings: IVimGlobalSettings,
-        _textBuffer: ITextBuffer
+        globalSettings: IVimGlobalSettings,
+        textBuffer: ITextBuffer
     ) = 
 
+    let _globalSettings = globalSettings
+    let _textBuffer = textBuffer
+
     /// List of characters which represent the end of a sentence. 
     static let SentenceEndChars = ['.'; '!'; '?']
 
diff --git a/Src/VimCore/VimBuffer.fs b/Src/VimCore/VimBuffer.fs
index 81f2320fba..8d1d242795 100644
--- a/Src/VimCore/VimBuffer.fs
+++ b/Src/VimCore/VimBuffer.fs
@@ -12,15 +12,23 @@ open Microsoft.VisualStudio.Utilities
 /// need the same data provided by IVimBuffer.
 type VimBufferData 
     (
-        _vimTextBuffer: IVimTextBuffer,
-        _textView: ITextView,
-        _windowSettings: IVimWindowSettings,
-        _jumpList: IJumpList,
-        _statusUtil: IStatusUtil,
-        _selectionUtil: ISelectionUtil,
-        _caretRegisterMap: ICaretRegisterMap
+        vimTextBuffer: IVimTextBuffer,
+        textView: ITextView,
+        windowSettings: IVimWindowSettings,
+        jumpList: IJumpList,
+        statusUtil: IStatusUtil,
+        selectionUtil: ISelectionUtil,
+        caretRegisterMap: ICaretRegisterMap
     ) =
 
+    let _vimTextBuffer = vimTextBuffer
+    let _textView = textView
+    let _windowSettings = windowSettings
+    let _jumpList = jumpList
+    let _statusUtil = statusUtil
+    let _selectionUtil = selectionUtil
+    let _caretRegisterMap = caretRegisterMap
+
     let mutable _currentDirectory: string option = None
     let mutable _visualCaretStartPoint: ITrackingPoint option = None
     let mutable _visualAnchorPoint: ITrackingPoint option = None 
@@ -178,14 +186,21 @@ type internal ModeMap
 
 type internal VimBuffer 
     (
-        _vimBufferData: IVimBufferData,
-        _incrementalSearch: IIncrementalSearch,
-        _motionUtil: IMotionUtil,
-        _wordNavigator: ITextStructureNavigator,
-        _windowSettings: IVimWindowSettings,
-        _commandUtil: ICommandUtil
+        vimBufferData: IVimBufferData,
+        incrementalSearch: IIncrementalSearch,
+        motionUtil: IMotionUtil,
+        textStructureNavigator: ITextStructureNavigator,
+        windowSettings: IVimWindowSettings,
+        commandUtil: ICommandUtil
     ) as this =
 
+    let _vimBufferData = vimBufferData
+    let _incrementalSearch = incrementalSearch
+    let _motionUtil = motionUtil
+    let _wordNavigator = textStructureNavigator
+    let _windowSettings = windowSettings
+    let _commandUtil = commandUtil
+
     /// Maximum number of maps which can occur for a key map.  This is not a standard vim or gVim
     /// setting.  It's a hueristic setting meant to prevent infinite recursion in the specific cases
     /// that maxmapdepth can't or won't catch (see :help maxmapdepth).  
diff --git a/Src/VimCore/VimBuffer.fsi b/Src/VimCore/VimBuffer.fsi
index 32d2085059..81540170c7 100644
--- a/Src/VimCore/VimBuffer.fsi
+++ b/Src/VimCore/VimBuffer.fsi
@@ -12,7 +12,7 @@ type internal VimBufferData =
 
 type internal VimBuffer =
 
-    new: vimBufferData: IVimBufferData * incrementalSearch: IIncrementalSearch * motionUtil: IMotionUtil * textStructureNavigator: ITextStructureNavigator * windowSettings: IVimWindowSettings * commandutil: ICommandUtil -> VimBuffer
+    new: vimBufferData: IVimBufferData * incrementalSearch: IIncrementalSearch * motionUtil: IMotionUtil * textStructureNavigator: ITextStructureNavigator * windowSettings: IVimWindowSettings * commandUtil: ICommandUtil -> VimBuffer
 
     member AddMode: mode: IMode -> unit
 
diff --git a/Src/VimCore/VimRegex.fs b/Src/VimCore/VimRegex.fs
index 3693a43495..1527a921ae 100644
--- a/Src/VimCore/VimRegex.fs
+++ b/Src/VimCore/VimRegex.fs
@@ -260,7 +260,7 @@ type VimRegex
     member x.Regex = _regex
     member x.IncludesNewLine = _includesNewLine
     member x.MatchesVisualSelection = _matchesVisualSelection
-    member x.IsMatch input = _regex.IsMatch(input)
+    member x.IsMatch pattern = _regex.IsMatch(pattern)
     member x.Replace (input: string) (replacement: string) (replaceData: VimRegexReplaceData) (registerMap: IRegisterMap) = 
         let collection = _regex.Matches(input)
         if collection.Count > 0 then
@@ -974,6 +974,6 @@ module VimRegexFactory =
         let options = CreateRegexOptions globalSettings
         Create pattern options
 
-    let CreateBcl pattern options =
-        VimRegexUtils.TryCreateRegex pattern options
+    let CreateBcl pattern regexOptions =
+        VimRegexUtils.TryCreateRegex pattern regexOptions
 
diff --git a/Src/VimCore/VimTextBuffer.fs b/Src/VimCore/VimTextBuffer.fs
index c90e54d5f3..7745a5ce63 100644
--- a/Src/VimCore/VimTextBuffer.fs
+++ b/Src/VimCore/VimTextBuffer.fs
@@ -9,16 +9,24 @@ open Microsoft.VisualStudio.Utilities
 
 type internal VimTextBuffer 
     (
-        _textBuffer: ITextBuffer,
-        _localAbbreviationMap: IVimLocalAbbreviationMap,
-        _localKeyMap: IVimLocalKeyMap,
-        _localSettings: IVimLocalSettings,
-        _bufferTrackingService: IBufferTrackingService,
-        _undoRedoOperations: IUndoRedoOperations,
-        _wordUtil: WordUtil,
-        _vim: IVim
+        textBuffer: ITextBuffer,
+        localAbbreviationMap: IVimLocalAbbreviationMap,
+        localKeyMap: IVimLocalKeyMap,
+        localSettings: IVimLocalSettings,
+        bufferTrackingService: IBufferTrackingService,
+        undoRedoOperations: IUndoRedoOperations,
+        wordUtil: WordUtil,
+        vim: IVim
     ) =
 
+    let _textBuffer = textBuffer
+    let _localAbbreviationMap = localAbbreviationMap
+    let _localKeyMap = localKeyMap
+    let _localSettings = localSettings
+    let _bufferTrackingService = bufferTrackingService
+    let _undoRedoOperations = undoRedoOperations
+    let _wordUtil = wordUtil
+    let _vim = vim
     let _vimHost = _vim.VimHost
     let _globalSettings = _localSettings.GlobalSettings
     let _modeLineInterpreter = ModeLineInterpreter(_textBuffer, _localSettings)
diff --git a/Src/VimCore/WordUtil.fs b/Src/VimCore/WordUtil.fs
index ec31489fae..154c084920 100644
--- a/Src/VimCore/WordUtil.fs
+++ b/Src/VimCore/WordUtil.fs
@@ -9,7 +9,9 @@ open System.Diagnostics
 [<UsedInBackgroundThread()>]
 [<Sealed>]
 [<Class>]
-type SnapshotWordUtil(_keywordCharSet: VimCharSet) = 
+type SnapshotWordUtil(keywordCharSet: VimCharSet) = 
+
+    let _keywordCharSet = keywordCharSet
 
     member x.KeywordCharSet = _keywordCharSet
     member x.IsBigWordChar c = not (Char.IsWhiteSpace(c))
@@ -72,7 +74,7 @@ type SnapshotWordUtil(_keywordCharSet: VimCharSet) =
     /// in the middle of a word the span of the entire word will be returned
     ///
     /// This can be called from a background thread via ITextSearchService.
-    member x.GetWordSpans kind path point = 
+    member x.GetWordSpans wordKind path point = 
 
         let snapshot = SnapshotPointUtil.GetSnapshot point
         let line = SnapshotPointUtil.GetContainingLine point
@@ -87,7 +89,7 @@ type SnapshotWordUtil(_keywordCharSet: VimCharSet) =
                 let offset = line.Start.Position
                 line.Extent
                 |> SnapshotSpanUtil.GetText 
-                |> x.GetWordSpansInText kind path 
+                |> x.GetWordSpansInText wordKind path 
                 |> Seq.map (fun span -> SnapshotSpan(snapshot, span.Start + offset, span.Length)))
         |> Seq.concat
         |> Seq.filter (fun span -> 
@@ -149,8 +151,10 @@ type SnapshotWordNavigator
 
 [<Sealed>]
 [<Class>]
-type WordUtil(_textBuffer: ITextBuffer, _localSettings: IVimLocalSettings) as this =
+type WordUtil(textBuffer: ITextBuffer, localSettings: IVimLocalSettings) as this =
 
+    let _textBuffer = textBuffer
+    let _localSettings = localSettings
     let mutable _snapshotWordUtil = SnapshotWordUtil(_localSettings.IsKeywordCharSet)
     let mutable _snapshotWordNavigator = Unchecked.defaultof<SnapshotWordNavigator>
     let mutable _wordNavigator = Unchecked.defaultof<ITextStructureNavigator>
diff --git a/VsVim.sln b/VsVim.sln
index 43dbb8679c..946b657959 100644
--- a/VsVim.sln
+++ b/VsVim.sln
@@ -15,7 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VsVim", "Src\VsVim\VsVim.csproj", "{11710F28-88D6-44DD-99DB-1F0AAA8CDAA0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VsVim", "Src\VsVim\VsVim.csproj", "{11710F28-88D6-44DD-99DB-1F0AAA8CDAA0}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VimCoreTest", "Test\VimCoreTest\VimCoreTest.csproj", "{B4FC7C81-E500-47C8-A884-2DBB7CA77123}"
 EndProject
@@ -60,26 +60,37 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VsVimTest", "Test\VsVimTest
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "VimSpecific", "Src\VimSpecific\VimSpecific.shproj", "{DE7E4031-D2E8-450E-8558-F00A6F19FA5C}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "VimCore", "Src\VimCore\VimCore.fsproj", "{333D15E0-96F8-4B87-8B03-467220EED275}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "VimCore", "Src\VimCore\VimCore.fsproj", "{333D15E0-96F8-4B87-8B03-467220EED275}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VimMac", "Src\VimMac\VimMac.csproj", "{33887119-3C41-4D8B-9A54-14AE8B2212B1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VimMac", "Src\VimMac\VimMac.csproj", "{33887119-3C41-4D8B-9A54-14AE8B2212B1}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Src\VsSpecific\VsSpecific\VsSpecific.projitems*{003af6b2-eb30-4494-b89f-15e1390fe47d}*SharedItemsImports = 13
-		Src\VsSpecific\VsSpecific\VsSpecific.projitems*{4bbec6cf-089e-4f22-8649-5144388c655d}*SharedItemsImports = 4
-		Src\VsSpecific\VsSpecific\VsSpecific.projitems*{d8eb4054-f9eb-45de-b07f-254e253028e7}*SharedItemsImports = 4
+		Src\VimSpecific\VimSpecific.projitems*{33887119-3c41-4d8b-9a54-14ae8b2212b1}*SharedItemsImports = 5
+		Src\VimSpecific\VimSpecific.projitems*{4bbec6cf-089e-4f22-8649-5144388c655d}*SharedItemsImports = 5
+		Src\VsSpecific\VsSpecific\VsSpecific.projitems*{4bbec6cf-089e-4f22-8649-5144388c655d}*SharedItemsImports = 5
+		Src\VimSpecific\VimSpecific.projitems*{6819ad26-901e-4261-95aa-9913d435296a}*SharedItemsImports = 5
+		Src\VimSpecific\VimSpecific.projitems*{80595422-09e0-40ac-9573-1a1d210b04f3}*SharedItemsImports = 5
+		Src\VsSpecific\VsSpecific\VsSpecific.projitems*{80595422-09e0-40ac-9573-1a1d210b04f3}*SharedItemsImports = 5
+		Src\VimSpecific\VimSpecific.projitems*{8db1c327-21a1-448b-a7a1-23eef6baa785}*SharedItemsImports = 5
+		Src\VimSpecific\VimSpecific.projitems*{d8eb4054-f9eb-45de-b07f-254e253028e7}*SharedItemsImports = 5
+		Src\VsSpecific\VsSpecific\VsSpecific.projitems*{d8eb4054-f9eb-45de-b07f-254e253028e7}*SharedItemsImports = 5
 		Src\VimSpecific\VimSpecific.projitems*{de7e4031-d2e8-450e-8558-f00a6f19fa5c}*SharedItemsImports = 13
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Mixed Platforms = Debug|Mixed Platforms
 		Debug|x86 = Debug|x86
+		DebugMac|Any CPU = DebugMac|Any CPU
+		DebugMac|Mixed Platforms = DebugMac|Mixed Platforms
+		DebugMac|x86 = DebugMac|x86
 		Release|Any CPU = Release|Any CPU
 		Release|Mixed Platforms = Release|Mixed Platforms
 		Release|x86 = Release|x86
-		DebugMac|Any CPU = DebugMac|Any CPU
 		ReleaseMac|Any CPU = ReleaseMac|Any CPU
+		ReleaseMac|Mixed Platforms = ReleaseMac|Mixed Platforms
+		ReleaseMac|x86 = ReleaseMac|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{11710F28-88D6-44DD-99DB-1F0AAA8CDAA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -87,114 +98,202 @@ Global
 		{11710F28-88D6-44DD-99DB-1F0AAA8CDAA0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{11710F28-88D6-44DD-99DB-1F0AAA8CDAA0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{11710F28-88D6-44DD-99DB-1F0AAA8CDAA0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{11710F28-88D6-44DD-99DB-1F0AAA8CDAA0}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{11710F28-88D6-44DD-99DB-1F0AAA8CDAA0}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{11710F28-88D6-44DD-99DB-1F0AAA8CDAA0}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
+		{11710F28-88D6-44DD-99DB-1F0AAA8CDAA0}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{11710F28-88D6-44DD-99DB-1F0AAA8CDAA0}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{11710F28-88D6-44DD-99DB-1F0AAA8CDAA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{11710F28-88D6-44DD-99DB-1F0AAA8CDAA0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{11710F28-88D6-44DD-99DB-1F0AAA8CDAA0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{11710F28-88D6-44DD-99DB-1F0AAA8CDAA0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{11710F28-88D6-44DD-99DB-1F0AAA8CDAA0}.Release|x86.ActiveCfg = Release|Any CPU
-		{11710F28-88D6-44DD-99DB-1F0AAA8CDAA0}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{11710F28-88D6-44DD-99DB-1F0AAA8CDAA0}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{11710F28-88D6-44DD-99DB-1F0AAA8CDAA0}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{11710F28-88D6-44DD-99DB-1F0AAA8CDAA0}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
+		{11710F28-88D6-44DD-99DB-1F0AAA8CDAA0}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{11710F28-88D6-44DD-99DB-1F0AAA8CDAA0}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{B4FC7C81-E500-47C8-A884-2DBB7CA77123}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B4FC7C81-E500-47C8-A884-2DBB7CA77123}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B4FC7C81-E500-47C8-A884-2DBB7CA77123}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{B4FC7C81-E500-47C8-A884-2DBB7CA77123}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{B4FC7C81-E500-47C8-A884-2DBB7CA77123}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B4FC7C81-E500-47C8-A884-2DBB7CA77123}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4FC7C81-E500-47C8-A884-2DBB7CA77123}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B4FC7C81-E500-47C8-A884-2DBB7CA77123}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B4FC7C81-E500-47C8-A884-2DBB7CA77123}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{B4FC7C81-E500-47C8-A884-2DBB7CA77123}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{B4FC7C81-E500-47C8-A884-2DBB7CA77123}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B4FC7C81-E500-47C8-A884-2DBB7CA77123}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B4FC7C81-E500-47C8-A884-2DBB7CA77123}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B4FC7C81-E500-47C8-A884-2DBB7CA77123}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B4FC7C81-E500-47C8-A884-2DBB7CA77123}.Release|x86.ActiveCfg = Release|Any CPU
-		{B4FC7C81-E500-47C8-A884-2DBB7CA77123}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{B4FC7C81-E500-47C8-A884-2DBB7CA77123}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{B4FC7C81-E500-47C8-A884-2DBB7CA77123}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B4FC7C81-E500-47C8-A884-2DBB7CA77123}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
+		{B4FC7C81-E500-47C8-A884-2DBB7CA77123}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{B4FC7C81-E500-47C8-A884-2DBB7CA77123}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{0C79E8E6-EBBF-4342-B4C2-DCCF212A776B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0C79E8E6-EBBF-4342-B4C2-DCCF212A776B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0C79E8E6-EBBF-4342-B4C2-DCCF212A776B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{0C79E8E6-EBBF-4342-B4C2-DCCF212A776B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{0C79E8E6-EBBF-4342-B4C2-DCCF212A776B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0C79E8E6-EBBF-4342-B4C2-DCCF212A776B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C79E8E6-EBBF-4342-B4C2-DCCF212A776B}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{0C79E8E6-EBBF-4342-B4C2-DCCF212A776B}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0C79E8E6-EBBF-4342-B4C2-DCCF212A776B}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0C79E8E6-EBBF-4342-B4C2-DCCF212A776B}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{0C79E8E6-EBBF-4342-B4C2-DCCF212A776B}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{0C79E8E6-EBBF-4342-B4C2-DCCF212A776B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0C79E8E6-EBBF-4342-B4C2-DCCF212A776B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0C79E8E6-EBBF-4342-B4C2-DCCF212A776B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0C79E8E6-EBBF-4342-B4C2-DCCF212A776B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0C79E8E6-EBBF-4342-B4C2-DCCF212A776B}.Release|x86.ActiveCfg = Release|Any CPU
 		{0C79E8E6-EBBF-4342-B4C2-DCCF212A776B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{0C79E8E6-EBBF-4342-B4C2-DCCF212A776B}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0C79E8E6-EBBF-4342-B4C2-DCCF212A776B}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
+		{0C79E8E6-EBBF-4342-B4C2-DCCF212A776B}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{0C79E8E6-EBBF-4342-B4C2-DCCF212A776B}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{65A749E0-F1B1-4E43-BE73-25072EE398C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{65A749E0-F1B1-4E43-BE73-25072EE398C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{65A749E0-F1B1-4E43-BE73-25072EE398C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{65A749E0-F1B1-4E43-BE73-25072EE398C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{65A749E0-F1B1-4E43-BE73-25072EE398C6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{65A749E0-F1B1-4E43-BE73-25072EE398C6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{65A749E0-F1B1-4E43-BE73-25072EE398C6}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{65A749E0-F1B1-4E43-BE73-25072EE398C6}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{65A749E0-F1B1-4E43-BE73-25072EE398C6}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
+		{65A749E0-F1B1-4E43-BE73-25072EE398C6}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{65A749E0-F1B1-4E43-BE73-25072EE398C6}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{65A749E0-F1B1-4E43-BE73-25072EE398C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{65A749E0-F1B1-4E43-BE73-25072EE398C6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{65A749E0-F1B1-4E43-BE73-25072EE398C6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{65A749E0-F1B1-4E43-BE73-25072EE398C6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{65A749E0-F1B1-4E43-BE73-25072EE398C6}.Release|x86.ActiveCfg = Release|Any CPU
 		{65A749E0-F1B1-4E43-BE73-25072EE398C6}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{65A749E0-F1B1-4E43-BE73-25072EE398C6}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{65A749E0-F1B1-4E43-BE73-25072EE398C6}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
+		{65A749E0-F1B1-4E43-BE73-25072EE398C6}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{65A749E0-F1B1-4E43-BE73-25072EE398C6}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{797C1463-3984-47BE-8CD2-4FF68D1E30DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{797C1463-3984-47BE-8CD2-4FF68D1E30DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{797C1463-3984-47BE-8CD2-4FF68D1E30DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{797C1463-3984-47BE-8CD2-4FF68D1E30DA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{797C1463-3984-47BE-8CD2-4FF68D1E30DA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{797C1463-3984-47BE-8CD2-4FF68D1E30DA}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{797C1463-3984-47BE-8CD2-4FF68D1E30DA}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{797C1463-3984-47BE-8CD2-4FF68D1E30DA}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{797C1463-3984-47BE-8CD2-4FF68D1E30DA}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
+		{797C1463-3984-47BE-8CD2-4FF68D1E30DA}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{797C1463-3984-47BE-8CD2-4FF68D1E30DA}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{797C1463-3984-47BE-8CD2-4FF68D1E30DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{797C1463-3984-47BE-8CD2-4FF68D1E30DA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{797C1463-3984-47BE-8CD2-4FF68D1E30DA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{797C1463-3984-47BE-8CD2-4FF68D1E30DA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{797C1463-3984-47BE-8CD2-4FF68D1E30DA}.Release|x86.ActiveCfg = Release|Any CPU
 		{797C1463-3984-47BE-8CD2-4FF68D1E30DA}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{797C1463-3984-47BE-8CD2-4FF68D1E30DA}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{797C1463-3984-47BE-8CD2-4FF68D1E30DA}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
+		{797C1463-3984-47BE-8CD2-4FF68D1E30DA}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{797C1463-3984-47BE-8CD2-4FF68D1E30DA}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{979DEDC6-25E2-494B-9E8F-6E42078C601C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{979DEDC6-25E2-494B-9E8F-6E42078C601C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{979DEDC6-25E2-494B-9E8F-6E42078C601C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{979DEDC6-25E2-494B-9E8F-6E42078C601C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{979DEDC6-25E2-494B-9E8F-6E42078C601C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{979DEDC6-25E2-494B-9E8F-6E42078C601C}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{979DEDC6-25E2-494B-9E8F-6E42078C601C}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{979DEDC6-25E2-494B-9E8F-6E42078C601C}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{979DEDC6-25E2-494B-9E8F-6E42078C601C}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
+		{979DEDC6-25E2-494B-9E8F-6E42078C601C}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{979DEDC6-25E2-494B-9E8F-6E42078C601C}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{979DEDC6-25E2-494B-9E8F-6E42078C601C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{979DEDC6-25E2-494B-9E8F-6E42078C601C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{979DEDC6-25E2-494B-9E8F-6E42078C601C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{979DEDC6-25E2-494B-9E8F-6E42078C601C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{979DEDC6-25E2-494B-9E8F-6E42078C601C}.Release|x86.ActiveCfg = Release|Any CPU
 		{979DEDC6-25E2-494B-9E8F-6E42078C601C}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{979DEDC6-25E2-494B-9E8F-6E42078C601C}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{979DEDC6-25E2-494B-9E8F-6E42078C601C}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
+		{979DEDC6-25E2-494B-9E8F-6E42078C601C}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{979DEDC6-25E2-494B-9E8F-6E42078C601C}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.Release|x86.ActiveCfg = Release|Any CPU
-		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
 		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
+		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{E27DBBF1-6116-4E32-8FA5-07DCE5E62BB6}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Debug|x86.Build.0 = Debug|Any CPU
+		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Release|x86.ActiveCfg = Release|Any CPU
 		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.Release|x86.Build.0 = Release|Any CPU
-		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
+		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{8DB1C327-21A1-448B-A7A1-23EEF6BAA785}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
+		{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.Release|x86.ActiveCfg = Release|Any CPU
 		{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
+		{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{04DA2433-0F43-42C0-AD53-DAA7F1B22E2D}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{D8EB4054-F9EB-45DE-B07F-254E253028E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D8EB4054-F9EB-45DE-B07F-254E253028E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D8EB4054-F9EB-45DE-B07F-254E253028E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{D8EB4054-F9EB-45DE-B07F-254E253028E7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{D8EB4054-F9EB-45DE-B07F-254E253028E7}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{D8EB4054-F9EB-45DE-B07F-254E253028E7}.Debug|x86.Build.0 = Debug|Any CPU
+		{D8EB4054-F9EB-45DE-B07F-254E253028E7}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{D8EB4054-F9EB-45DE-B07F-254E253028E7}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{D8EB4054-F9EB-45DE-B07F-254E253028E7}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D8EB4054-F9EB-45DE-B07F-254E253028E7}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D8EB4054-F9EB-45DE-B07F-254E253028E7}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{D8EB4054-F9EB-45DE-B07F-254E253028E7}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{D8EB4054-F9EB-45DE-B07F-254E253028E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D8EB4054-F9EB-45DE-B07F-254E253028E7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D8EB4054-F9EB-45DE-B07F-254E253028E7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -202,12 +301,22 @@ Global
 		{D8EB4054-F9EB-45DE-B07F-254E253028E7}.Release|x86.ActiveCfg = Release|Any CPU
 		{D8EB4054-F9EB-45DE-B07F-254E253028E7}.Release|x86.Build.0 = Release|Any CPU
 		{D8EB4054-F9EB-45DE-B07F-254E253028E7}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{D8EB4054-F9EB-45DE-B07F-254E253028E7}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D8EB4054-F9EB-45DE-B07F-254E253028E7}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
+		{D8EB4054-F9EB-45DE-B07F-254E253028E7}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{D8EB4054-F9EB-45DE-B07F-254E253028E7}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{4BBEC6CF-089E-4F22-8649-5144388C655D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4BBEC6CF-089E-4F22-8649-5144388C655D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4BBEC6CF-089E-4F22-8649-5144388C655D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{4BBEC6CF-089E-4F22-8649-5144388C655D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{4BBEC6CF-089E-4F22-8649-5144388C655D}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{4BBEC6CF-089E-4F22-8649-5144388C655D}.Debug|x86.Build.0 = Debug|Any CPU
+		{4BBEC6CF-089E-4F22-8649-5144388C655D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{4BBEC6CF-089E-4F22-8649-5144388C655D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{4BBEC6CF-089E-4F22-8649-5144388C655D}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4BBEC6CF-089E-4F22-8649-5144388C655D}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4BBEC6CF-089E-4F22-8649-5144388C655D}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{4BBEC6CF-089E-4F22-8649-5144388C655D}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{4BBEC6CF-089E-4F22-8649-5144388C655D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4BBEC6CF-089E-4F22-8649-5144388C655D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4BBEC6CF-089E-4F22-8649-5144388C655D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -215,12 +324,22 @@ Global
 		{4BBEC6CF-089E-4F22-8649-5144388C655D}.Release|x86.ActiveCfg = Release|Any CPU
 		{4BBEC6CF-089E-4F22-8649-5144388C655D}.Release|x86.Build.0 = Release|Any CPU
 		{4BBEC6CF-089E-4F22-8649-5144388C655D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{4BBEC6CF-089E-4F22-8649-5144388C655D}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4BBEC6CF-089E-4F22-8649-5144388C655D}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
+		{4BBEC6CF-089E-4F22-8649-5144388C655D}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{4BBEC6CF-089E-4F22-8649-5144388C655D}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{80595422-09E0-40AC-9573-1A1D210B04F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{80595422-09E0-40AC-9573-1A1D210B04F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{80595422-09E0-40AC-9573-1A1D210B04F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{80595422-09E0-40AC-9573-1A1D210B04F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{80595422-09E0-40AC-9573-1A1D210B04F3}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{80595422-09E0-40AC-9573-1A1D210B04F3}.Debug|x86.Build.0 = Debug|Any CPU
+		{80595422-09E0-40AC-9573-1A1D210B04F3}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{80595422-09E0-40AC-9573-1A1D210B04F3}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{80595422-09E0-40AC-9573-1A1D210B04F3}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{80595422-09E0-40AC-9573-1A1D210B04F3}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
+		{80595422-09E0-40AC-9573-1A1D210B04F3}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{80595422-09E0-40AC-9573-1A1D210B04F3}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{80595422-09E0-40AC-9573-1A1D210B04F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{80595422-09E0-40AC-9573-1A1D210B04F3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{80595422-09E0-40AC-9573-1A1D210B04F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -228,12 +347,22 @@ Global
 		{80595422-09E0-40AC-9573-1A1D210B04F3}.Release|x86.ActiveCfg = Release|Any CPU
 		{80595422-09E0-40AC-9573-1A1D210B04F3}.Release|x86.Build.0 = Release|Any CPU
 		{80595422-09E0-40AC-9573-1A1D210B04F3}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{80595422-09E0-40AC-9573-1A1D210B04F3}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{80595422-09E0-40AC-9573-1A1D210B04F3}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
+		{80595422-09E0-40AC-9573-1A1D210B04F3}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{80595422-09E0-40AC-9573-1A1D210B04F3}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{863A0141-59C5-481D-A3FC-A5812D973FEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{863A0141-59C5-481D-A3FC-A5812D973FEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{863A0141-59C5-481D-A3FC-A5812D973FEB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{863A0141-59C5-481D-A3FC-A5812D973FEB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{863A0141-59C5-481D-A3FC-A5812D973FEB}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{863A0141-59C5-481D-A3FC-A5812D973FEB}.Debug|x86.Build.0 = Debug|Any CPU
+		{863A0141-59C5-481D-A3FC-A5812D973FEB}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{863A0141-59C5-481D-A3FC-A5812D973FEB}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{863A0141-59C5-481D-A3FC-A5812D973FEB}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{863A0141-59C5-481D-A3FC-A5812D973FEB}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
+		{863A0141-59C5-481D-A3FC-A5812D973FEB}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{863A0141-59C5-481D-A3FC-A5812D973FEB}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{863A0141-59C5-481D-A3FC-A5812D973FEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{863A0141-59C5-481D-A3FC-A5812D973FEB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{863A0141-59C5-481D-A3FC-A5812D973FEB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -241,58 +370,94 @@ Global
 		{863A0141-59C5-481D-A3FC-A5812D973FEB}.Release|x86.ActiveCfg = Release|Any CPU
 		{863A0141-59C5-481D-A3FC-A5812D973FEB}.Release|x86.Build.0 = Release|Any CPU
 		{863A0141-59C5-481D-A3FC-A5812D973FEB}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{863A0141-59C5-481D-A3FC-A5812D973FEB}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{863A0141-59C5-481D-A3FC-A5812D973FEB}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
+		{863A0141-59C5-481D-A3FC-A5812D973FEB}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{863A0141-59C5-481D-A3FC-A5812D973FEB}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{6819AD26-901E-4261-95AA-9913D435296A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6819AD26-901E-4261-95AA-9913D435296A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6819AD26-901E-4261-95AA-9913D435296A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6819AD26-901E-4261-95AA-9913D435296A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{6819AD26-901E-4261-95AA-9913D435296A}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{6819AD26-901E-4261-95AA-9913D435296A}.Debug|x86.Build.0 = Debug|Any CPU
+		{6819AD26-901E-4261-95AA-9913D435296A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{6819AD26-901E-4261-95AA-9913D435296A}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6819AD26-901E-4261-95AA-9913D435296A}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6819AD26-901E-4261-95AA-9913D435296A}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{6819AD26-901E-4261-95AA-9913D435296A}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{6819AD26-901E-4261-95AA-9913D435296A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6819AD26-901E-4261-95AA-9913D435296A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6819AD26-901E-4261-95AA-9913D435296A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6819AD26-901E-4261-95AA-9913D435296A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6819AD26-901E-4261-95AA-9913D435296A}.Release|x86.ActiveCfg = Release|Any CPU
 		{6819AD26-901E-4261-95AA-9913D435296A}.Release|x86.Build.0 = Release|Any CPU
-		{6819AD26-901E-4261-95AA-9913D435296A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{6819AD26-901E-4261-95AA-9913D435296A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
-		{6819AD26-901E-4261-95AA-9913D435296A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6819AD26-901E-4261-95AA-9913D435296A}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6819AD26-901E-4261-95AA-9913D435296A}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
+		{6819AD26-901E-4261-95AA-9913D435296A}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{6819AD26-901E-4261-95AA-9913D435296A}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.Debug|x86.Build.0 = Debug|Any CPU
+		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.Release|x86.ActiveCfg = Release|Any CPU
 		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.Release|x86.Build.0 = Release|Any CPU
-		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
 		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
+		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{1B6583BD-A59E-44EE-98DA-29B18E99443B}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{333D15E0-96F8-4B87-8B03-467220EED275}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{333D15E0-96F8-4B87-8B03-467220EED275}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{333D15E0-96F8-4B87-8B03-467220EED275}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{333D15E0-96F8-4B87-8B03-467220EED275}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{333D15E0-96F8-4B87-8B03-467220EED275}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{333D15E0-96F8-4B87-8B03-467220EED275}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{333D15E0-96F8-4B87-8B03-467220EED275}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{333D15E0-96F8-4B87-8B03-467220EED275}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{333D15E0-96F8-4B87-8B03-467220EED275}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
+		{333D15E0-96F8-4B87-8B03-467220EED275}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{333D15E0-96F8-4B87-8B03-467220EED275}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{333D15E0-96F8-4B87-8B03-467220EED275}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{333D15E0-96F8-4B87-8B03-467220EED275}.Release|Any CPU.Build.0 = Release|Any CPU
 		{333D15E0-96F8-4B87-8B03-467220EED275}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{333D15E0-96F8-4B87-8B03-467220EED275}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{333D15E0-96F8-4B87-8B03-467220EED275}.Release|x86.ActiveCfg = Release|Any CPU
-		{333D15E0-96F8-4B87-8B03-467220EED275}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{333D15E0-96F8-4B87-8B03-467220EED275}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
 		{333D15E0-96F8-4B87-8B03-467220EED275}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{333D15E0-96F8-4B87-8B03-467220EED275}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{333D15E0-96F8-4B87-8B03-467220EED275}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{333D15E0-96F8-4B87-8B03-467220EED275}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
+		{333D15E0-96F8-4B87-8B03-467220EED275}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{333D15E0-96F8-4B87-8B03-467220EED275}.ReleaseMac|x86.Build.0 = Release|Any CPU
 		{33887119-3C41-4D8B-9A54-14AE8B2212B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{33887119-3C41-4D8B-9A54-14AE8B2212B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{33887119-3C41-4D8B-9A54-14AE8B2212B1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{33887119-3C41-4D8B-9A54-14AE8B2212B1}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+		{33887119-3C41-4D8B-9A54-14AE8B2212B1}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+		{33887119-3C41-4D8B-9A54-14AE8B2212B1}.DebugMac|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{33887119-3C41-4D8B-9A54-14AE8B2212B1}.DebugMac|Mixed Platforms.Build.0 = Debug|Any CPU
+		{33887119-3C41-4D8B-9A54-14AE8B2212B1}.DebugMac|x86.ActiveCfg = Debug|Any CPU
+		{33887119-3C41-4D8B-9A54-14AE8B2212B1}.DebugMac|x86.Build.0 = Debug|Any CPU
 		{33887119-3C41-4D8B-9A54-14AE8B2212B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{33887119-3C41-4D8B-9A54-14AE8B2212B1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{33887119-3C41-4D8B-9A54-14AE8B2212B1}.Release|x86.ActiveCfg = Release|Any CPU
-		{33887119-3C41-4D8B-9A54-14AE8B2212B1}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
-		{33887119-3C41-4D8B-9A54-14AE8B2212B1}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
 		{33887119-3C41-4D8B-9A54-14AE8B2212B1}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
 		{33887119-3C41-4D8B-9A54-14AE8B2212B1}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+		{33887119-3C41-4D8B-9A54-14AE8B2212B1}.ReleaseMac|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{33887119-3C41-4D8B-9A54-14AE8B2212B1}.ReleaseMac|Mixed Platforms.Build.0 = Release|Any CPU
+		{33887119-3C41-4D8B-9A54-14AE8B2212B1}.ReleaseMac|x86.ActiveCfg = Release|Any CPU
+		{33887119-3C41-4D8B-9A54-14AE8B2212B1}.ReleaseMac|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE