diff --git a/BitWarden/_.package.json b/BitWarden/_.package.json
deleted file mode 100644
index ccb690e..0000000
--- a/BitWarden/_.package.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "package": {
-    "Name": "BitWarden",
-    "Condition": [
-      {
-        "custom": null,
-        "System": null,
-        "Hostname": null,
-        "Username": null,
-        "CmdletExists": null,
-        "ModuleExists": null,
-        "AppExeExists": [
-          "bw"
-        ],
-        "Logic": 0
-      }
-    ]
-  }
-}
diff --git a/BitWarden/profile.d/env.ps1 b/BitWarden/profile.d/env.ps1
deleted file mode 100644
index 8b8eb9b..0000000
--- a/BitWarden/profile.d/env.ps1
+++ /dev/null
@@ -1,10 +0,0 @@
-if( -not (Test-Path env:BITWARDEN_CLI_PATH) ) {
-    $env:BITWARDEN_CLI_PATH = Get-Command bw -Type Application | Select-Object -First 1 -ExpandProperty Source
-}
-
-$local:bwPath = Join-Path $HOME 'tmp'
-$null = New-Item -ItemType Directory -Path $bwPath -Force
-$bwPath = Join-Path $bwPath 'git-credential-bw.key'
-if( Test-Path $bwPath ) {
-    $env:BW_SESSION= Get-Content $bwPath
-}
\ No newline at end of file
diff --git a/BitWarden/src/modules.json b/BitWarden/src/modules.json
deleted file mode 100644
index ce3be90..0000000
--- a/BitWarden/src/modules.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "Always": [
-      "BitwardenWrapper"
-    ]
-}
-
diff --git a/HomeAssistant/Get-HA_Addon.ps1 b/HomeAssistant/Get-HA_Addon.ps1
index 0c25a03..a9a43ef 100644
--- a/HomeAssistant/Get-HA_Addon.ps1
+++ b/HomeAssistant/Get-HA_Addon.ps1
@@ -1,7 +1,5 @@
 [CmdletBinding(SupportsShouldProcess)]param(
-    [Alias('Slug')]
     [string[]]$AddOnSlug,
-    [Alias('Name')]
     [string[]]$AddOnName,
     [switch]$InspectContainer,
     [switch]$NoPatternMatch,
@@ -16,7 +14,7 @@ $addons = $addons.data.addons
 switch( $Status ) {
     'Installed'    { $addons = $addons | Where-Object Installed }
     'NotInstalled' { $addons = $addons | Where-Object -Not Installed }
-    default        { 
+    'Running'      { 
             $addons = $addons | Where-Object Installed
             $InspectContainer = $true
         }
@@ -51,7 +49,7 @@ switch( $Status ) {
         $addons = $addons | Where-Object Status -eq 'running'
     }
     'Stopped'      { 
-        $addons = $addons | Where-Object Status -ne 'running'
+        $addons = $addons | Where-Object Status -eq 'running'
     }
 }
 
diff --git a/HomeAssistant/Start-HA_Addon.ps1 b/HomeAssistant/Start-HA_Addon.ps1
index 3319184..6c05c28 100644
--- a/HomeAssistant/Start-HA_Addon.ps1
+++ b/HomeAssistant/Start-HA_Addon.ps1
@@ -1,23 +1,8 @@
 [CmdletBinding(SupportsShouldProcess)]param(
-    [Parameter(ValueFromPipeline,ValueFromPipelineByPropertyName)]
-    [Alias('Slug')]
     [string[]]$AddOnSlug,
     [switch]$NoPatternMatch
 )
 
-begin{}
-process{
-    foreach( $slug in $AddOnSlug ) {
-        Get-HA_Addon 'Running' -AddOnSlug:$slug -NoPatternMatch:$NoPatternMatch | ForEach-Object {
-            $local:a = $_
-            $local:invocation = Invoke-HomeAssistantCli addons start $a.slug
-            Get-HA_Addon -InspectContainer -NoPatternMatch -AddOnSlug $a.slug |
-                Select-Object @{
-                    L='result';E={$invocation.result}
-                },@{
-                    L='data';E={$invocation.data}
-                },*
-        }
-    }
+Get-HA_Addon 'Installed' -AddOnSlug:$AddOnSlug -NoPatternMatch:$NoPatternMatch | ForEach-Object {
+    Invoke-HomeAssistantCli addons start $_.slug
 }
-end{}
diff --git a/HomeAssistant/Stop-HA_Addon.ps1 b/HomeAssistant/Stop-HA_Addon.ps1
index a1d9166..dc4b65d 100644
--- a/HomeAssistant/Stop-HA_Addon.ps1
+++ b/HomeAssistant/Stop-HA_Addon.ps1
@@ -1,23 +1,8 @@
 [CmdletBinding(SupportsShouldProcess)]param(
-    [Parameter(ValueFromPipeline,ValueFromPipelineByPropertyName)]
-    [Alias('Slug')]
     [string[]]$AddOnSlug,
     [switch]$NoPatternMatch
 )
 
-begin{}
-process{
-    foreach( $slug in $AddOnSlug ) {
-        Get-HA_Addon 'Running' -AddOnSlug:$slug -NoPatternMatch:$NoPatternMatch | ForEach-Object {
-            $local:a = $_
-            $local:invocation = Invoke-HomeAssistantCli addons stop $a.slug
-            Get-HA_Addon -InspectContainer -NoPatternMatch -AddOnSlug $a.slug |
-                Select-Object @{
-                    L='result';E={$invocation.result}
-                },@{
-                    L='data';E={$invocation.data}
-                },*
-        }
-    }
+Get-HA_Addon 'Running' -AddOnSlug:$AddOnSlug -NoPatternMatch:$NoPatternMatch | ForEach-Object {
+    Invoke-HomeAssistantCli addons stop $_.slug
 }
-end{}
diff --git a/Proxmox/Restart-Proxmox.ps1 b/Proxmox/Restart-Proxmox.ps1
deleted file mode 100644
index 83bfffa..0000000
--- a/Proxmox/Restart-Proxmox.ps1
+++ /dev/null
@@ -1,9 +0,0 @@
-
-sudo killall -9 corosync
-sudo systemctl restart pve-cluster
-sudo systemctl restart pvedaemon
-sudo systemctl restart pveproxy
-sudo systemctl restart pvestatd
-
-sudo qm stop 100
-sudo qm start 100
diff --git a/Proxmox/_.package.json b/Proxmox/_.package.json
deleted file mode 100644
index b9138ac..0000000
--- a/Proxmox/_.package.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "package": {
-    "Name": "Proxmox",
-    "Condition": [
-      {
-        "custom": null,
-        "System": [ "Linux" ],
-        "Hostname": null,
-        "Username": null,
-        "CmdletExists": null,
-        "ModuleExists": null,
-        "AppExeExists": "/usr/sbin/qm",
-        "Logic": 0
-      }
-    ]
-  }
-}
diff --git a/base.linux/Edit-MountUnit.ps1 b/base.linux/Edit-MountUnit.ps1
index 2ee1430..b9f8d69 100644
--- a/base.linux/Edit-MountUnit.ps1
+++ b/base.linux/Edit-MountUnit.ps1
@@ -5,10 +5,6 @@
 
 $local:pathChar = [IO.Path]::DirectorySeparatorChar
 $MountPath = Get-Path $MountPath
-$local:MountName = $($($(
-    $MountPath -replace '-','\\x2d'
-    ).Replace( $pathChar, '-' )
-    ) -replace '^-',''
-)
+$local:MountName = $MountPath -replace '-','\\x2d' -replace $pathChar,'-' -replace '^-','' -replace '-^',''
 
 $MountName
diff --git a/base.linux/Update-OSz.ps1 b/base.linux/Update-OSz.ps1
index 8a8df0a..a82dfcc 100644
--- a/base.linux/Update-OSz.ps1
+++ b/base.linux/Update-OSz.ps1
@@ -5,10 +5,6 @@ param(
 
 $local:detectedDisistro = cat /etc/os-release | Select-String -Pattern "^ID=" | ForEach-Object { $_ -split '=' | Select-Object -Skip 1 }
 switch ($detectedDisistro) {
-    'arch'   {
-        Update-ArchOSz -Mode:$Mode $args
-    }
-    {$_ -in 'debian','ubuntu','zorin'} {
-        Update-UbuntuOSz -Mode:$Mode $args
-    }
+    'arch'   { Update-ArchOSz -Mode:$Mode $args }
+    'ubuntu' { Update-UbuntuOSz -Mode:$Mode $args }
 }
diff --git a/base.linux/profile.d/env.ps1 b/base.linux/profile.d/env.ps1
index 56073a8..4e3e64d 100644
--- a/base.linux/profile.d/env.ps1
+++ b/base.linux/profile.d/env.ps1
@@ -6,21 +6,4 @@ if( -not (Test-Path env:XDG_DATA_HOME) ) {
 }
 if( -not (Test-Path env:XDG_CONFIG_HOME) ) {
    $env:XDG_CONFIG_HOME="$HOME/.config"
-}
-
-if(  -not (
-        Test-Path env:SHELL_PARENT
-    ) -and -not (
-        $env:SHELL -match 'p(wsh|owershell)$'
-    ) -and (
-        Test-Path env:SHELL
-    )
-) {
-    $env:COMPLETION_SHELL_PREFERENCE = $env:SHELL
-    $env:SHELL_PARENT = $env:SHELL
-}
-$env:SHELL = Get-Process -Id $PID | Select-Object -ExpandProperty Path
-Get-Command -ListImported Set-UnixCompleter -ErrorAction Ignore |
-    ForEach-Object {
-        Set-UnixCompleter -Shell $env:COMPLETION_SHELL_PREFERENCE
-    }
+}
\ No newline at end of file
diff --git a/base/Get-Path.ps1 b/base/Get-Path.ps1
index b12326b..c07385e 100644
--- a/base/Get-Path.ps1
+++ b/base/Get-Path.ps1
@@ -5,6 +5,17 @@
     [string[]]$Path
 )
 process {
+
+    function Get-FullPath {
+        param([string]$Path)
+
+        if([System.IO.Path]::IsPathRooted($Path)){
+            [System.IO.Path]::GetFullPath($Path)
+        }else{
+            [System.IO.Path]::GetFullPath((Join-Path $PWD $Path))
+        }
+    }
+
     foreach( $local:p in $Path ) {
         switch( $p[0] ) {
             '@' { $p = Join-Path $MyPSScriptRoot $p.Substring(1) }
@@ -16,9 +27,6 @@ process {
             }
         }
 
-        # clean end of path from DirectorySeparatorChars
-        $p = $p -replace '[/\\]+$',''
-
         $p = $p -replace '#C-','#C-#' -replace '\*','#C-A#' -replace '\?','#C-Q#'
         if([System.IO.Path]::IsPathRooted($p)){
             $p = [System.IO.Path]::GetFullPath($p)
@@ -36,3 +44,9 @@ process {
         $p
     }
 }
+# try {
+#     get-item $Path -Force -ErrorAction Stop | 
+#         Select-Object -ExpandProperty FullName
+# } catch {
+#     $_.targetObject
+# }
diff --git a/docker/profile.d/Docker.class.ps1 b/docker/profile.d/Docker.class.ps1
index 3720c12..79444d9 100644
--- a/docker/profile.d/Docker.class.ps1
+++ b/docker/profile.d/Docker.class.ps1
@@ -37,7 +37,6 @@ class DockerNetworks {
   }
 }
 
-if( -not (Get-Command docker-compose -ErrorAction Ignore) ) { return }
 class DockerComposeCommands { #: System.Management.Automation.IValidateSetValuesGenerator {
     static [string[]] $cachedCommands = @()
   static [string[]] _GetValidValues([string]$wordToComplete,[string]$subcommand,[bool]$Strict) {
diff --git a/zfs/Aliases/zls.ps1 b/zfs/Aliases/zls.ps1
deleted file mode 100644
index 1261402..0000000
--- a/zfs/Aliases/zls.ps1
+++ /dev/null
@@ -1 +0,0 @@
-Get-ZfsItem
diff --git a/zfs/Get-ZfsItem.ps1 b/zfs/Get-ZfsItem.ps1
deleted file mode 100644
index 3cc1d13..0000000
--- a/zfs/Get-ZfsItem.ps1
+++ /dev/null
@@ -1,25 +0,0 @@
-[CmdletBinding()]param(
-    [string[]]$Options='name,used,avail,refer,canmount,mounted,mountpoint'
-)
-
-$Options = $Options -join ','
-if( $options -split ',' -notcontains 'name' ) { $options = "name,$Options" }
-$local:prev = '';
-zfs list -o $Options |
-    ForEach-Object { $_ -replace ' +',"`t" } |
-    ConvertFrom-Csv -Delimiter "`t" |
-    Where-Object Name -NotMatch '^rpool/var/lib/docker/' |
-    ForEach-Object {
-        $local:o = $_ | Select-Object @{L='-';E={''}},*
-        $local:tmpPrev = $o.Name -replace '^(\w+(\W\w+(\W\w+)?)?).*','$1';
-        if( $tmpPrev -notmatch "^$prev" -and $prev -notin ('','NAME') ) {
-            $o.'-' = "`n-"
-        };
-        $prev = $tmpPrev;
-        if( $o.MOUNTPOINT ) {
-            $o.MOUNTPOINT = $o.MOUNTPOINT -replace '^none$','<none>'
-        }
-        $o
-    } |
-    Format-Table -Wrap
-
diff --git a/zfs/zls.ps1 b/zfs/zls.ps1
new file mode 100644
index 0000000..cc156e1
--- /dev/null
+++ b/zfs/zls.ps1
@@ -0,0 +1,11 @@
+$local:prev = "";
+zfs list -o name,used,avail,refer,canmount,mounted,mountpoint $args |
+    grep -v 'docker/' |
+    ForEach-Object {
+        $local:tmpPrev = $_ -replace '^(\w+(\W\w+(\W\w+)?)?).*','$1';
+        if( $tmpPrev -notmatch "^$prev" -and $prev -notin ('','NAME') ) {
+            '-----------------'
+        };
+        $prev = $tmpPrev;
+        $_
+    }
\ No newline at end of file