diff --git a/Edit-TextFile.ps1 b/Edit-TextFile.ps1
index e25d0d6..095c019 100644
--- a/Edit-TextFile.ps1
+++ b/Edit-TextFile.ps1
@@ -7,7 +7,7 @@
 $local:editors = $env:EDITOR,'nvim','code'
 $local:editor = $null
 foreach( $local:testEditor in $editors ) {
-  if( Get-Command -Type Application $testEditor -ErrorAction SilentlyContinue ) {
+  if( $(try{Get-Command -Type Application $testEditor -ErrorAction SilentlyContinue}catch{}) ) {
     $editor = $testEditor
     break;
   }
@@ -17,13 +17,9 @@ if( $editor -match 'vim?$' ) {
   $editor += ' -p'
 }
 
-if( $sudo ) {
-  $editor = "/usr/bin/env sudo $editor"
-}
-
 if( $editor -match 'code(\.exe)?$' ) {
   if( -not (Get-Process -Name 'code' -ErrorAction SilentlyContinue) ) {
-    & $editor
+    Invoke-ExpressionEx -sudo:$sudo $editor
   }
 }
 
@@ -31,5 +27,5 @@ $local:arguments = $Path -join "' '"
 if( $Path ) { $arguments = "'$arguments'" }
 
 if( $PSCmdlet.ShouldProcess( "Edit ($editor): $arguments" ) ) {
-  Invoke-Expression "$editor $arguments"
+  Invoke-ExpressionEx -sudo:$sudo $editor "$arguments"
 }
diff --git a/Setup-Profile.ps1 b/Setup-Profile.ps1
index c9ca89f..0173767 100644
--- a/Setup-Profile.ps1
+++ b/Setup-Profile.ps1
@@ -25,102 +25,115 @@ function _Setup {
 ## ProfileCode function (source) will contain the code to be written
 #######################################################################
 function ProfileCode_pre_common {
-    # # If TMUX isn't loaded, start byobu, then exit this script (and current shell)
-    # if ( -not ( Test-Path env:TMUX ) ) { byobu; exit }
+# # If TMUX isn't loaded, start byobu, then exit this script (and current shell)
+# if ( -not ( Test-Path env:TMUX ) ) { byobu; exit }
 }
 #######################################################################
 ## common Profile Code - receommended not to change this
 ## Code will be loaded from profile.d sub-directory after this.
 #######################################################################
 function ProfileCode_post_common {
-    # This loads the personal profile section from the $MyPSScriptRoot/profile.d directory
-    Get-Command Reload-MyScripts -ErrorAction SilentlyContinue | ForEach-Object { . $_.Name }
+# This loads the personal profile section from the $MyPSScriptRoot/profile.d directory
+Get-Command Reload-MyScripts -ErrorAction SilentlyContinue | ForEach-Object { . $_.Name }
 }
 #######################################################################
-## Setup-Profile code continues below
+## _Setup Logic starts here
 #######################################################################
 
-if ( $GitClone -and -not (Test-Path $(Join-Path $MyPSScriptRoot '.git')) ) {
-    if ( -not [bool]$(Get-Command git -ErrorAction SilentlyContinue)  ) {
-        throw "No git command found, you may either omit the -GitClone switch or install git and try again."
-    }
-    if ( $PSCmdlet.ShouldProcess("Pull git repo from $GitURL into $MyPSScriptRoot ?") ) {
-        Push-Location $MyPSScriptRoot
-        $local:tmpGitDir = New-TemporaryFile
-        Remove-Item $tmpGitDir
-        New-Item -Type Directory $tmpGitDir.FullName | Out-Null
-        $local:GitOutput = "$(& git clone $GitURL $tmpGitDir.FullName --no-checkout)"
-        Write-Verbose $GitOutput
-        Move-Item (Join-Path $tmpGitDir.FullName .git) ./.git
-        Remove-Item $tmpGitDir.FullName
-        $GitOutput = "$(& git checkout --force)"
-        Write-Verbose $GitOutput
-        Pop-Location
-    }
-}
-
-$local:ProfileSignature = [PSCustomObject]([ordered]@{
-        Begin   = '#### SZ Auto Profile Setup - BEGIN ####' 
-        End     = '#### SZ Auto Profile Setup -  END  ####'
-        Removed = '#### SZ Auto Profile Setup'
-    })
-
-function New-ProfileSetupStatus {
-param($Name, $Path, $Status, $Exist)
-return [PSCustomObject]([ordered]@{
-        Name   = $Name
-        Path   = $Path
-        Status = $Status
-        Exist  = $Exist
-    })
-}
-
-$local:_profiles = $PROFILE | fl * -Force | Out-String -Stream | ForEach-Object {
-    $local:p = $($_ -split ' : [/A-Z\\]');
-    if ( $p[0] -match 'User' ) {
-        $p[0].Trim()
-    }
-}
-$local:_profile = $profile.CurrentUserAllHosts;
-$local:randomSeed = "####$(Get-Random)####";
-
-if ( $RemoveOnly -and $ConfirmPreference -eq 'High' -and (-not $PSBoundParameters -or -not $PSBoundParameters.ContainsKey('Confirm')) ) {
-    $script:ConfirmPreference = 'Low'
-}
-
-
-if ( $sudo -or $(Test-IsAdmin) ) { $_profile = $profile.AllUsersAllHosts }
-$_profiles | Foreach-Object {
-    $local:p = Invoke-Expression "`$profile.$_"
-    $local:profileContent = $randomSeed;
-    $local:exists = Test-Path $p
-    $local:userFile = $($_ -match 'CurrentUser')
-    $local:cleanupValue = ''
-    if ( $exists -and ((Get-Content -Path $p | Out-String ) -match $ProfileSignature.Begin ) ) {
-        Write-Verbose "Found code in [$_]'$p', preparing..."
-        $local:gate = $true;
-        $profileContent = Get-Content $p | ForEach-Object {
-            if ( -not $gate ) {
-                if ( $_ -match $ProfileSignature.End ) {
-                    $gate = $true;
-                }
-            }
-            else {
-                if ( $_ -match $ProfileSignature.Begin ) {
-                    $gate = $false;
-                    $cleanupValue = $ProfileSignature.Removed
-                    return $randomSeed;
-                }
-                return $_
-            }
+    if ( $GitClone -and -not (Test-Path $(Join-Path $MyPSScriptRoot '.git')) ) {
+        if ( -not [bool]$(Get-Command git -ErrorAction SilentlyContinue)  ) {
+            throw "No git command found, you may either omit the -GitClone switch or install git and try again."
+        }
+        if ( $PSCmdlet.ShouldProcess("Pull git repo from $GitURL into $MyPSScriptRoot ?") ) {
+            Push-Location $MyPSScriptRoot
+            $local:tmpGitDir = New-TemporaryFile
+            Remove-Item $tmpGitDir
+            New-Item -Type Directory $tmpGitDir.FullName | Out-Null
+            Write-Verbose "Cloning git repo [$GitURL] into temporary location ('$($tmpGitDir.FullName)')..."
+            $local:GitOutput = "$(& git clone $GitURL $tmpGitDir.FullName --no-checkout)"
+            Write-Verbose $GitOutput
+            Write-Verbose "Moving git repo from temp location to $MyPSScriptRoot . . ."
+            Move-Item (Join-Path $tmpGitDir.FullName .git) ./.git
+            Remove-Item $tmpGitDir.FullName
+            Write-Verbose "Checking out repo..."
+            $GitOutput = "$(& git checkout --force)"
+            Write-Verbose $GitOutput
+            Pop-Location
+            Write-Verbose "-GitClone step done."
         }
     }
 
-    $local:insertProfileCode = $false;
-    if ( ($p -eq $_profile) -and -not $RemoveOnly ) {
-        $insertProfileCode = $true
-        Write-Verbose "Inserting ProfileCode into $($_)..."
-        $cleanupValue = $((@(
+    $local:ProfileSignature = [PSCustomObject]([ordered]@{
+            Begin   = '#### SZ Auto Profile Setup - BEGIN ####' 
+            End     = '#### SZ Auto Profile Setup -  END  ####'
+            Removed = '#### SZ Auto Profile Setup - ----- ####'
+            Match   = '#### SZ Auto Profile Setup'
+        })
+
+    function New-ProfileSetupStatus {
+    param($Name, $Path, $Status, $Exist)
+        return [PSCustomObject]([ordered]@{
+                Name   = $Name
+                Path   = $Path
+                Status = $Status
+                Exist  = $Exist
+            })
+    }
+
+    $local:_profiles = $PROFILE | fl * -Force | Out-String -Stream | ForEach-Object {
+        $local:p = $($_ -split ' : [/A-Z\\]');
+        if ( $p[0] -match 'User' ) {
+            $p[0].Trim()
+        }
+    }
+    $local:_profile = $profile.CurrentUserAllHosts;
+    $local:randomSeed = "####$(Get-Random)####";
+
+    if ( $RemoveOnly -and $ConfirmPreference -eq 'High' -and (-not $PSBoundParameters -or -not $PSBoundParameters.ContainsKey('Confirm')) ) {
+        $script:ConfirmPreference = 'Low'
+    }
+
+
+    if ( $sudo -or $(Test-IsAdmin) ) { $_profile = $profile.AllUsersAllHosts }
+    $_profiles | Foreach-Object {
+        $local:p = Invoke-Expression "`$profile.$_"
+        $local:profileContent = $randomSeed;
+        $local:exists = Test-Path $p
+        $local:userFile = $($_ -match 'CurrentUser')
+        $local:cleanupValue = ''
+        if ( $exists ) {
+            if ( (Get-Content -Path $p | Out-String ) -match $ProfileSignature.Match ) {
+                Write-Verbose "Found code in [$_]'$p', preparing..."
+                $local:gate = $true;
+                $profileContent = Get-Content $p | ForEach-Object {
+                    if ( -not $gate ) {
+                        if ( $_ -match $ProfileSignature.End ) {
+                            $gate = $true;
+                        }
+                    }
+                    else {
+                        if ( $_ -match $ProfileSignature.Match ) {
+                            if ( $_ -match $ProfileSignature.Begin ) {
+                                $gate = $false;
+                            }
+                            $cleanupValue = $ProfileSignature.Removed
+                            return $randomSeed;
+                        }
+                        return $_
+                    }
+                }
+            } else {
+                $profileContent += "`n`n$(Get-Content $p -Raw)"
+            }
+        }
+        
+        if( -not( $profileContent -match $randomSeed ) ) { $profileContent = "$randomSeed`n$profileContent" }
+
+        $local:insertProfileCode = $false;
+        if ( ($p -eq $_profile) -and -not $RemoveOnly ) {
+            $insertProfileCode = $true
+            Write-Verbose "Inserting ProfileCode into $($_)..."
+            $cleanupValue = $((@(
                     '',
                     $ProfileSignature.Begin,
                     '',
@@ -134,65 +147,66 @@ $_profiles | Foreach-Object {
                     '',
                     $ProfileSignature.End
                 ) -join "`n" ).Trim().Replace(('$' + '_'), ('$$' + '_')))
-    }
-    $profileContent = $($profileContent -replace $randomSeed, $cleanupValue).Trim()
+        }
+        
+        $profileContent = $($profileContent -replace $randomSeed, $cleanupValue).Trim()
 
-    $local:shouldSudo = $sudo -and -not $userFile
-    $local:status = 'Skipped'
-    if ( $VerbosePreference -eq 'Continue' ) { $ShowSkipped = $true }
-    if ( -not ([string]::IsNullOrWhiteSpace($profileContent)) ) {
-        $status = "Need $(if($insertProfileCode){'Setup'}else{'Cleanup'})"
-        if ( $sudo -or $userFile ) {
-            Write-Verbose "Writing content to $($_)..."
-            $local:tmpOutput = New-TemporaryFile -WhatIf:$false
-            $profileContent | Out-File $tmpOutput.FullName -WhatIf:$false
-            if ( $shouldSudo -and $( $PSVersionTable.Platform -eq 'Unix' ) ) {
-                Invoke-ExpressionEx -sudo:$shouldSudo chmod 'a+r' $tmpOutput.FullName
-            }
-            try {
-                function BreakPointHere {} BreakPointHere;
-
-                $local:errMsg = $(Invoke-ExpressionEx -sudo:$shouldSudo "Move-Item $($tmpOutput.FullName) $p -Force:`$$Force -ErrorAction Stop | Out-Null" 2>&1)
-                if ( $errMsg ) {
-                    Write-Error "$errMsg"
-                    $status = $status -replace 'Need ', 'Failed '
+        $local:shouldSudo = $sudo -and -not $userFile
+        $local:status = 'Skipped'
+        if ( $VerbosePreference -eq 'Continue' ) { $ShowSkipped = $true }
+        # Test if new profile Content will be empty
+        if ( -not ([string]::IsNullOrWhiteSpace($profileContent)) ) {
+            $status = "Need $(if($insertProfileCode){if($exists){'Setup'}else{'Init'}}else{'Cleanup'})"
+            if ( $sudo -or $userFile ) {
+                Write-Verbose "Writing content to $($_)..."
+                $local:tmpOutput = New-TemporaryFile -WhatIf:$false -Confirm:$false
+                $profileContent | Out-File $tmpOutput.FullName -WhatIf:$false -Confirm:$false
+                if ( $shouldSudo -and $( $PSVersionTable.Platform -eq 'Unix' ) ) {
+                    # Make sure the file has the right permissions on a Unix machine
+                    Invoke-ExpressionEx -sudo:$shouldSudo chmod 'a+r' $tmpOutput.FullName
                 }
-                else {
-                    $status = $status -replace 'Need ', ''
+                try {
+                    $local:errMsg = $(Invoke-ExpressionEx -sudo:$shouldSudo "Move-Item $($tmpOutput.FullName) $p -Force:`$$Force -ErrorAction Stop | Out-Null" 2>&1)
+                    if ( $errMsg ) {
+                        Write-Error "$errMsg"
+                        $status = $status -replace 'Need ', 'Failed '
+                    }
+                    else {
+                        $status = $status -replace 'Need ', ''
+                    }
+                }
+                catch {
+                    Write-Error "Writing $p failed!"
                 }
             }
-            catch {
-                Write-Error "Writing $p failed!"
+            else {
+                $status = "Need $status"
+                Write-Error "Cannot write into [$_]'$p'! Please re-run with sudo."
             }
         }
-        else {
-            $status = "Need $status"
-            Write-Error "Cannot write into [$_]'$p'! Please re-run with sudo."
-        }
-    }
-    elseif ( ($Force -or $RemoveOnly) -and $exists ) {
-        $status = 'Need Removal'
-        if ( $sudo -or $userFile ) {
-            Write-Verbose "Removing [$_]'$p'..."
-            try {
-                Invoke-ExpressionEx -sudo:$shouldSudo Remove-Item $p
-                if ( -not (Test-Path $p) ) { $status = 'Removed' }
+        elseif ( ($Force -or $RemoveOnly) -and $exists ) {
+            $status = 'Need Removal'
+            if ( $sudo -or $userFile ) {
+                Write-Verbose "Removing [$_]'$p'..."
+                try {
+                    Invoke-ExpressionEx -sudo:$shouldSudo Remove-Item $p
+                    if ( -not (Test-Path $p) ) { $status = 'Removed' }
+                }
+                catch {
+                    Write-Error "Removal of $p failed!"
+                }
             }
-            catch {
-                Write-Error "Removal of $p failed!"
+            else {
+                Write-Error "Cannot remove [$_]'$p'! Please re-run with sudo."
             }
         }
-        else {
-            Write-Error "Cannot remove [$_]'$p'! Please re-run with sudo."
+        if ( $status -ne 'Skipped' -or $ShowSkipped ) {
+            if ( $shouldSudo -and $status -ne 'Skipped' ) { $status = "$status via sudo" }
+            New-ProfileSetupStatus -Name $_ -Path $p -Status $status -Exist $(Test-Path $p)
         }
     }
-    if ( $status -ne 'Skipped' -or $ShowSkipped ) {
-        if ( $shouldSudo -and $status -ne 'Skipped' ) { $status = "$status via sudo" }
-        New-ProfileSetupStatus -Name $_ -Path $p -Status $status -Exist $(Test-Path $p)
-    }
-}
 
-Remove-Item function:ProfileCode* -Confirm:$false
+    Remove-Item function:ProfileCode* -Confirm:$false
 }
 
 #######################################################################
@@ -218,93 +232,93 @@ function Invoke-ExpressionEx {
     [string[]]$expr
 )
 
-function do_sudo {
-[CmdletBinding()]param(
-    [string]$sudo_cmd
-)
-
-    function do_sudo_win {
+    function do_sudo {
     [CmdletBinding()]param(
         [string]$sudo_cmd
     )
 
-        $local:sudo_exec = [string]::Empty
-        if ( (Get-Command scoop -ErrorAction SilentlyContinue) ) {
-            $sudo_exec = $(scoop which gsudo *>&1)
-            if ( $sudo_exec -match 'not found' ) {
-                $sudo_exec = $(scoop which sudo *>&1)
+        function do_sudo_win {
+        [CmdletBinding()]param(
+            [string]$sudo_cmd
+        )
+
+            $local:sudo_exec = [string]::Empty
+            if ( (Get-Command scoop -ErrorAction SilentlyContinue) ) {
+                $sudo_exec = $(scoop which gsudo *>&1)
+                if ( $sudo_exec -match 'not found' ) {
+                    $sudo_exec = $(scoop which sudo *>&1)
+                }
+                if ( $sudo_exec -match 'not found' ) { $sudo_exec = [string]::Empty }
+            }
+            if ( $sudo_exec ) {
+                & $sudo_exec $sudo_cmd
+            }
+            else {
+                Write-Error "Didn't find a known sudo command"
             }
-            if ( $sudo_exec -match 'not found' ) { $sudo_exec = [string]::Empty }
         }
-        if ( $sudo_exec ) {
-            & $sudo_exec $sudo_cmd
+
+        if ( $PSVersionTable.Platform -eq 'Unix' ) {
+            /usr/bin/env sudo $(Get-PowerShellPath) "-noprofile" "-EncodedCommand" $(ConvertTo-Base64 $sudo_cmd)
         }
         else {
-            Write-Error "Didn't find a known sudo command"
+            $local:currentIdenity = [System.Security.Principal.WindowsIdentity]::GetCurrent()
+            if ( $currentIdenity.UserClaims.Value -contains 'S-1-5-32-544' ) {
+                do_sudo_win $sudo_cmd
+            }
+            else {
+                Write-Error "User [$($currentIdenity.Name)]does not have permissions to run as admin."
+            }
         }
+
     }
 
-    if ( $PSVersionTable.Platform -eq 'Unix' ) {
-        /usr/bin/env sudo $(Get-PowerShellPath) "-noprofile" "-EncodedCommand" $(ConvertTo-Base64 $sudo_cmd)
-    }
-    else {
-        $local:currentIdenity = [System.Security.Principal.WindowsIdentity]::GetCurrent()
-        if ( $currentIdenity.UserClaims.Value -contains 'S-1-5-32-544' ) {
-            do_sudo_win $sudo_cmd
+    if ( $sudo -and -not $(Test-IsAdmin) ) {
+        $local:tmpOutputFile = $null
+        $local:tmpScriptFile = $null
+
+        $local:sudo_cmd = "$($expr -join ' ')".Trim()
+        if ( $Function ) {
+            $tmpScriptFile = New-TemporaryFile -WhatIf:$false -Confirm:$false
+            $tmpScriptFile = Move-Item $tmpScriptFile.FullName "$($tmpScriptFile.FullName).ps1" -PassThru -WhatIf:$false -Confirm:$false
+
+            $local:tmpScriptContent = Export-FunctionSource $Function
+            $sudo_cmd = "$Function $sudo_cmd"
+
+            $tmpScriptContent | Out-File $tmpScriptFile.FullName -WhatIf:$false
+            $expr = @( ".", $tmpScriptFile.FullName, ";", "`n$Function" ) + $expr
         }
-        else {
-            Write-Error "User [$($currentIdenity.Name)]does not have permissions to run as admin."
+
+        $expr = @(
+            "`n`$WhatIfPreference=`$$WhatIfPreference;",
+            "`n`$VerbosePreference='$VerbosePreference';",
+            "`n`$ErrorActionPreference='$ErrorActionPreference';",
+            "`n`$ConfirmPreference='$ConfirmPreference';`n"
+        ) + $expr
+
+        if ( $MarshalOutput ) {
+            $tmpOutputFile = New-TemporaryFile -WhatIf:$false -Confirm:$false
+            $expr += @( "| Export-CliXml -Path '$($tmpOutputFile.FullName)'" )
         }
+
+        $expr += @( ";`n exit `$LastExitCode" )
+
+        ## $tmpScriptContent += "$($expr -join ' ')".Trim()
+        Write-Verbose "Performing the following command line via SUDO:`n{$sudo_cmd}"
+
+        $sudo_cmd = "$($expr -join ' ')".Trim()
+
+        do_sudo $sudo_cmd
+        ## do_sudo 'Get-Content' $tmpScriptFile.FullName '|' 'Invoke-Expression' '|' 'Export-Clixml' '-Path' $tmpOutputFile.FullName
+        #do_sudo $sudo_cmd
+
+        if ( $tmpScriptFile ) { Remove-Item $tmpScriptFile }
+        if ( $tmpOutputFile ) { Import-Clixml $tmpOutputFile; Remove-Item $tmpOutputFile }
+        return
     }
 
-}
-
-if ( $sudo -and -not $(Test-IsAdmin) ) {
-    $local:tmpOutputFile = $null
-    $local:tmpScriptFile = $null
-
-    $local:sudo_cmd = "$($expr -join ' ')".Trim()
-    if ( $Function ) {
-        $tmpScriptFile = New-TemporaryFile -WhatIf:$false -Confirm:$false
-        $tmpScriptFile = Move-Item $tmpScriptFile.FullName "$($tmpScriptFile.FullName).ps1" -PassThru -WhatIf:$false -Confirm:$false
-
-        $local:tmpScriptContent = Export-FunctionSource $Function
-        $sudo_cmd = "$Function $sudo_cmd"
-
-        $tmpScriptContent | Out-File $tmpScriptFile.FullName -WhatIf:$false
-        $expr = @( ".", $tmpScriptFile.FullName, ";", "`n$Function" ) + $expr
-    }
-
-    $expr = @(
-        "`n`$WhatIfPreference=`$$WhatIfPreference;",
-        "`n`$VerbosePreference='$VerbosePreference';",
-        "`n`$ErrorActionPreference='$ErrorActionPreference';",
-        "`n`$ConfirmPreference='$ConfirmPreference';`n"
-    ) + $expr
-
-    if ( $MarshalOutput ) {
-        $tmpOutputFile = New-TemporaryFile -WhatIf:$false -Confirm:$false
-        $expr += @( "| Export-CliXml -Path '$($tmpOutputFile.FullName)'" )
-    }
-
-    $expr += @( ";`n exit `$LastExitCode" )
-
-    ## $tmpScriptContent += "$($expr -join ' ')".Trim()
-    Write-Verbose "Performing the following command line via SUDO:`n{$sudo_cmd}"
-
-    $sudo_cmd = "$($expr -join ' ')".Trim()
-
-    do_sudo $sudo_cmd
-    ## do_sudo 'Get-Content' $tmpScriptFile.FullName '|' 'Invoke-Expression' '|' 'Export-Clixml' '-Path' $tmpOutputFile.FullName
-    #do_sudo $sudo_cmd
-
-    if ( $tmpScriptFile ) { Remove-Item $tmpScriptFile }
-    if ( $tmpOutputFile ) { Import-Clixml $tmpOutputFile; Remove-Item $tmpOutputFile }
-    return
-}
-
-Write-Verbose "Perofrming the following expression in-line:`n{$($expr -join ' ')}"
-Invoke-Expression "$expr"
+    Write-Verbose "Perofrming the following expression in-line:`n{$($expr -join ' ')}"
+    Invoke-Expression "$expr"
 }
 
 function Test-IsAdmin {
@@ -346,15 +360,15 @@ param(
     [string[]]$FunctionName
 )
 
-$local:src = ""
-foreach ( $local:func in $FunctionName ) {
-    if ( -not $NoHeader ) { $src += "`nfunction $func {" }
-    $src += "`n"
-    $src += $((Get-Command -Type Function $func).Definition) ### .Replace(('$'+'_'),('$$'+'_'))
-    if ( -not $NoHeader ) { $src += "`n}" }
-    $src += "`n"
-}
-return $src.Trim()
+    $local:src = ""
+    foreach ( $local:func in $FunctionName ) {
+        if ( -not $NoHeader ) { $src += "`nfunction $func {" }
+        $src += "`n"
+        $src += $((Get-Command -Type Function $func).Definition)
+        if ( -not $NoHeader ) { $src += "`n}" }
+        $src += "`n"
+    }
+    return $src.Trim()
 }
 
 # Are we running in Unix or Windows?