diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7025c94f0..e899035fa5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# <img src="https://img.shields.io/badge/-minor%20release-cd6f68?style=for-the-badge">  **28.0.4** *(2024-07-31)*
+
+<img src="https://img.shields.io/badge/-%20fix%20-orange"> Added missing translations on legacy mode
+
+<img src="https://img.shields.io/badge/-%20fix%20-orange"> Fixed height calculations on legacy mode  
+
+<img src="https://img.shields.io/badge/-%20fix%20-orange"> Now hidding the classic cursor setting on touch screen 
+
+<img src="https://img.shields.io/badge/-%20fix%20-orange"> Fixed gorodok heightmap/zscaling
+
+<img src="https://img.shields.io/badge/-%20improv%20-orange"> Code reworking
+
+</br></br><!-- CHANGELOG SPLIT MARKER -->
+
+
 # <img src="https://img.shields.io/badge/-minor%20release-cd6f68?style=for-the-badge">  **28.0.3** *(2024-07-26)*
 
 <img src="https://img.shields.io/badge/-%20improv%20-orange"> Improved language loading mechanic
diff --git a/README.md b/README.md
index 546cb8c756..fbd0650438 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,12 @@
 </h1>
 
 <p align="center">
-    <a href="https://github.com/sh4rkman/SquadCalc/blob/master/LICENSE"><img src="https://img.shields.io/github/license/Naereen/StrapDown.js.svg?style=for-the-badge" alt="Licence"></a>  
-    <img src="https://up.sharkman.info/api/badge/3/uptime/72?style=for-the-badge" alt="Uptime">
+    <a href="https://github.com/sh4rkman/SquadCalc?tab=MIT-1-ov-file#readme">
+      <img src="https://img.shields.io/github/license/Naereen/StrapDown.js.svg?style=for-the-badge" alt="Licence">
+    </a>  
+    <a href="https://squadcalc.app">
+      <img src="https://up.sharkman.info/api/badge/3/uptime/72?style=for-the-badge" alt="Uptime">
+    </a> 
 </p>
 
 <p align="center">
diff --git a/package-lock.json b/package-lock.json
index 1d25d05dff..7274a78268 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "squadcalc",
-  "version": "28.0.3",
+  "version": "28.0.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "squadcalc",
-      "version": "28.0.3",
+      "version": "28.0.4",
       "license": "MIT",
       "devDependencies": {
         "@playwright/test": "^1.43.1",
@@ -77,30 +77,30 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.24.9",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.9.tgz",
-      "integrity": "sha512-e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.2.tgz",
+      "integrity": "sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.24.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.9.tgz",
-      "integrity": "sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
+      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.24.9",
-        "@babel/helper-compilation-targets": "^7.24.8",
-        "@babel/helper-module-transforms": "^7.24.9",
-        "@babel/helpers": "^7.24.8",
-        "@babel/parser": "^7.24.8",
-        "@babel/template": "^7.24.7",
-        "@babel/traverse": "^7.24.8",
-        "@babel/types": "^7.24.9",
+        "@babel/generator": "^7.25.0",
+        "@babel/helper-compilation-targets": "^7.25.2",
+        "@babel/helper-module-transforms": "^7.25.2",
+        "@babel/helpers": "^7.25.0",
+        "@babel/parser": "^7.25.0",
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.2",
+        "@babel/types": "^7.25.2",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -125,12 +125,12 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.24.10",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.10.tgz",
-      "integrity": "sha512-o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.0.tgz",
+      "integrity": "sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.24.9",
+        "@babel/types": "^7.25.0",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^2.5.1"
@@ -165,12 +165,12 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz",
-      "integrity": "sha512-oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
+      "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.24.8",
+        "@babel/compat-data": "^7.25.2",
         "@babel/helper-validator-option": "^7.24.8",
         "browserslist": "^4.23.1",
         "lru-cache": "^5.1.1",
@@ -190,19 +190,17 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.8.tgz",
-      "integrity": "sha512-4f6Oqnmyp2PP3olgUMmOwC3akxSm5aBYraQ6YDdKy7NcAMkDECHWG0DEnV6M2UAkERgIBhYt8S27rURPg7SxWA==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.0.tgz",
+      "integrity": "sha512-GYM6BxeQsETc9mnct+nIIpf63SAyzvyYN7UB/IlTyd+MBg06afFGp0mIeUqGyWgS2mxad6vqbMrHVlaL3m70sQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-function-name": "^7.24.7",
         "@babel/helper-member-expression-to-functions": "^7.24.8",
         "@babel/helper-optimise-call-expression": "^7.24.7",
-        "@babel/helper-replace-supers": "^7.24.7",
+        "@babel/helper-replace-supers": "^7.25.0",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/traverse": "^7.25.0",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -222,9 +220,9 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.7.tgz",
-      "integrity": "sha512-03TCmXy2FtXJEZfbXDTSqq1fRJArk7lX9DOFC/47VthYcxyIOx+eXQmdo6DOQvrbpIix+KfXwvuXdFDZHxt+rA==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz",
+      "integrity": "sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.24.7",
@@ -263,43 +261,6 @@
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
-      "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz",
-      "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz",
-      "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-member-expression-to-functions": {
       "version": "7.24.8",
       "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz",
@@ -327,16 +288,15 @@
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.24.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.9.tgz",
-      "integrity": "sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz",
+      "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.24.7",
         "@babel/helper-module-imports": "^7.24.7",
         "@babel/helper-simple-access": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7"
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "@babel/traverse": "^7.25.2"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -367,14 +327,14 @@
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.7.tgz",
-      "integrity": "sha512-9pKLcTlZ92hNZMQfGCHImUpDOlAgkkpqalWEeftW5FBya75k8Li2ilerxkM/uBEj01iBZXcCIB/bwvDYgWyibA==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz",
+      "integrity": "sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-wrap-function": "^7.24.7"
+        "@babel/helper-wrap-function": "^7.25.0",
+        "@babel/traverse": "^7.25.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -384,14 +344,14 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.7.tgz",
-      "integrity": "sha512-qTAxxBM81VEyoAY0TtLrx1oAEJc09ZK67Q9ljQToqCnA+55eNwCORaxlKyu+rNfX86o8OXRUSNUnrtsAZXM9sg==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz",
+      "integrity": "sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-member-expression-to-functions": "^7.24.7",
-        "@babel/helper-optimise-call-expression": "^7.24.7"
+        "@babel/helper-member-expression-to-functions": "^7.24.8",
+        "@babel/helper-optimise-call-expression": "^7.24.7",
+        "@babel/traverse": "^7.25.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -426,18 +386,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
-      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-string-parser": {
       "version": "7.24.8",
       "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
@@ -466,28 +414,27 @@
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.24.7.tgz",
-      "integrity": "sha512-N9JIYk3TD+1vq/wn77YnJOqMtfWhNewNE+DJV4puD2X7Ew9J4JvrzrFDfTfyv5EgEXVy9/Wt8QiOErzEmv5Ifw==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz",
+      "integrity": "sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/template": "^7.24.7",
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.0",
+        "@babel/types": "^7.25.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.8.tgz",
-      "integrity": "sha512-gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.0.tgz",
+      "integrity": "sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.24.7",
-        "@babel/types": "^7.24.8"
+        "@babel/template": "^7.25.0",
+        "@babel/types": "^7.25.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -580,9 +527,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.8.tgz",
-      "integrity": "sha512-WzfbgXOkGzZiXXCqk43kKwZjzwx4oulxZi3nq2TYL9mOjQv6kYwul9mz6ID36njuL7Xkp6nJEfok848Zj10j/w==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.0.tgz",
+      "integrity": "sha512-CzdIU9jdP0dg7HdyB+bHvDJGagUv+qtzZt5rYCWwW6tITNqV9odjp6Qu41gkG0ca5UfdDUWrKkiAnHHdGRnOrA==",
       "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -592,13 +539,28 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.7.tgz",
-      "integrity": "sha512-TiT1ss81W80eQsN+722OaeQMY/G4yTb4G9JrqeiDADs3N8lbPMGldWi9x8tyqCW5NLx1Jh2AvkE6r6QvEltMMQ==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.0.tgz",
+      "integrity": "sha512-dG0aApncVQwAUJa8tP1VHTnmU67BeIQvKafd3raEx315H54FfkZSz3B/TT+33ZQAjatGJA79gZqTtqL5QZUKXw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.24.8",
+        "@babel/traverse": "^7.25.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.0.tgz",
+      "integrity": "sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.8"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -608,12 +570,12 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7.tgz",
-      "integrity": "sha512-unaQgZ/iRu/By6tsjMZzpeBZjChYfLYry6HrEXPoz3KmfF0sVBQ1l8zKMQ4xRGLWVsjuvB8nQfjNP/DcfEOCsg==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz",
+      "integrity": "sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.24.8"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -640,13 +602,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.7.tgz",
-      "integrity": "sha512-utA4HuR6F4Vvcr+o4DnjL8fCOlgRFGbeeBEGNg3ZTrLFw6VWG5XmUrvcQ0FjIYMU2ST4XcR2Wsp7t9qOAPnxMg==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0.tgz",
+      "integrity": "sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.24.8",
+        "@babel/traverse": "^7.25.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -918,15 +880,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.7.tgz",
-      "integrity": "sha512-o+iF77e3u7ZS4AoAuJvapz9Fm001PuD2V3Lp6OSE4FYQke+cSewYtnek+THqGRWyQloRCyvWL1OkyfNEl9vr/g==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.0.tgz",
+      "integrity": "sha512-uaIi2FdqzjpAMvVqvB51S42oC2JEVgh0LDsGfZVDysWE8LrJtQC2jvKmOqEYThKyB7bDEb7BP1GYWDm7tABA0Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-remap-async-to-generator": "^7.24.7",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
+        "@babel/helper-plugin-utils": "^7.24.8",
+        "@babel/helper-remap-async-to-generator": "^7.25.0",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/traverse": "^7.25.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -968,12 +930,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.7.tgz",
-      "integrity": "sha512-Nd5CvgMbWc+oWzBsuaMcbwjJWAcp5qzrbg69SZdHSP7AMY0AbWFqFO0WTFCA1jxhMCwodRwvRec8k0QUbZk7RQ==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz",
+      "integrity": "sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.24.8"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1016,18 +978,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.8.tgz",
-      "integrity": "sha512-VXy91c47uujj758ud9wx+OMgheXm4qJfyhj1P18YvlrQkNOSrwsteHk+EFS3OMGfhMhpZa0A+81eE7G4QC+3CA==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.0.tgz",
+      "integrity": "sha512-xyi6qjr/fYU304fiRwFbekzkqVJZ6A7hOjWZd+89FVcBqPV3S9Wuozz82xdpLspckeaafntbzglaW4pqpzvtSw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.24.7",
         "@babel/helper-compilation-targets": "^7.24.8",
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-function-name": "^7.24.7",
         "@babel/helper-plugin-utils": "^7.24.8",
-        "@babel/helper-replace-supers": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/helper-replace-supers": "^7.25.0",
+        "@babel/traverse": "^7.25.0",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -1108,6 +1068,22 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0.tgz",
+      "integrity": "sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.25.0",
+        "@babel/helper-plugin-utils": "^7.24.8"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
     "node_modules/@babel/plugin-transform-dynamic-import": {
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz",
@@ -1173,14 +1149,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.7.tgz",
-      "integrity": "sha512-U9FcnA821YoILngSmYkW6FjyQe2TyZD5pHt4EVIhmcTkrJw/3KqcrRSxuOo5tFZJi7TE19iDyI1u+weTI7bn2w==",
+      "version": "7.25.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz",
+      "integrity": "sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.24.7",
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-compilation-targets": "^7.24.8",
+        "@babel/helper-plugin-utils": "^7.24.8",
+        "@babel/traverse": "^7.25.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1206,12 +1182,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.7.tgz",
-      "integrity": "sha512-vcwCbb4HDH+hWi8Pqenwnjy+UiklO4Kt1vfspcQYFhJdpthSnW8XvWGyDZWKNVrVbVViI/S7K9PDJZiUmP2fYQ==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz",
+      "integrity": "sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.24.8"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1285,15 +1261,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.7.tgz",
-      "integrity": "sha512-GYQE0tW7YoaN13qFh3O1NCY4MPkUiAH3fiF7UcV/I3ajmDKEdG3l+UOcbAm4zUE3gnvUU+Eni7XrVKo9eO9auw==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz",
+      "integrity": "sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.24.7",
-        "@babel/helper-module-transforms": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7"
+        "@babel/helper-module-transforms": "^7.25.0",
+        "@babel/helper-plugin-utils": "^7.24.8",
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "@babel/traverse": "^7.25.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1683,19 +1659,20 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.8.tgz",
-      "integrity": "sha512-vObvMZB6hNWuDxhSaEPTKCwcqkAIuDtE+bQGn4XMXne1DSLzFVY8Vmj1bm+mUQXYNN8NmaQEO+r8MMbzPr1jBQ==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.2.tgz",
+      "integrity": "sha512-Y2Vkwy3ITW4id9c6KXshVV/x5yCGK7VdJmKkzOzNsDZMojRKfSA/033rRbLqlRozmhRXCejxWHLSJOg/wUHfzw==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.24.8",
-        "@babel/helper-compilation-targets": "^7.24.8",
+        "@babel/compat-data": "^7.25.2",
+        "@babel/helper-compilation-targets": "^7.25.2",
         "@babel/helper-plugin-utils": "^7.24.8",
         "@babel/helper-validator-option": "^7.24.8",
-        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.24.7",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.24.7",
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.0",
+        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.0",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.0",
         "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.7",
-        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.24.7",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.0",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
@@ -1716,29 +1693,30 @@
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.24.7",
-        "@babel/plugin-transform-async-generator-functions": "^7.24.7",
+        "@babel/plugin-transform-async-generator-functions": "^7.25.0",
         "@babel/plugin-transform-async-to-generator": "^7.24.7",
         "@babel/plugin-transform-block-scoped-functions": "^7.24.7",
-        "@babel/plugin-transform-block-scoping": "^7.24.7",
+        "@babel/plugin-transform-block-scoping": "^7.25.0",
         "@babel/plugin-transform-class-properties": "^7.24.7",
         "@babel/plugin-transform-class-static-block": "^7.24.7",
-        "@babel/plugin-transform-classes": "^7.24.8",
+        "@babel/plugin-transform-classes": "^7.25.0",
         "@babel/plugin-transform-computed-properties": "^7.24.7",
         "@babel/plugin-transform-destructuring": "^7.24.8",
         "@babel/plugin-transform-dotall-regex": "^7.24.7",
         "@babel/plugin-transform-duplicate-keys": "^7.24.7",
+        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.0",
         "@babel/plugin-transform-dynamic-import": "^7.24.7",
         "@babel/plugin-transform-exponentiation-operator": "^7.24.7",
         "@babel/plugin-transform-export-namespace-from": "^7.24.7",
         "@babel/plugin-transform-for-of": "^7.24.7",
-        "@babel/plugin-transform-function-name": "^7.24.7",
+        "@babel/plugin-transform-function-name": "^7.25.1",
         "@babel/plugin-transform-json-strings": "^7.24.7",
-        "@babel/plugin-transform-literals": "^7.24.7",
+        "@babel/plugin-transform-literals": "^7.25.2",
         "@babel/plugin-transform-logical-assignment-operators": "^7.24.7",
         "@babel/plugin-transform-member-expression-literals": "^7.24.7",
         "@babel/plugin-transform-modules-amd": "^7.24.7",
         "@babel/plugin-transform-modules-commonjs": "^7.24.8",
-        "@babel/plugin-transform-modules-systemjs": "^7.24.7",
+        "@babel/plugin-transform-modules-systemjs": "^7.25.0",
         "@babel/plugin-transform-modules-umd": "^7.24.7",
         "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7",
         "@babel/plugin-transform-new-target": "^7.24.7",
@@ -1807,9 +1785,9 @@
       "dev": true
     },
     "node_modules/@babel/runtime": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.8.tgz",
-      "integrity": "sha512-5F7SDGs1T72ZczbRwbGO9lQi0NLjQxzl6i4lJxLxfW9U5UluCSyEJeniWvnhl3/euNiqQVbo8zruhsDfid0esA==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.0.tgz",
+      "integrity": "sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw==",
       "dev": true,
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
@@ -1819,33 +1797,30 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
-      "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
+      "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.24.7",
-        "@babel/parser": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/parser": "^7.25.0",
+        "@babel/types": "^7.25.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.8.tgz",
-      "integrity": "sha512-t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.2.tgz",
+      "integrity": "sha512-s4/r+a7xTnny2O6FcZzqgT6nE4/GHEdcqj4qAeglbUOh0TeglEfmNJFAd/OLoVtGd6ZhAO8GCVvCNUO5t/VJVQ==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.24.8",
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/helper-hoist-variables": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
-        "@babel/parser": "^7.24.8",
-        "@babel/types": "^7.24.8",
+        "@babel/generator": "^7.25.0",
+        "@babel/parser": "^7.25.0",
+        "@babel/template": "^7.25.0",
+        "@babel/types": "^7.25.2",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -1863,9 +1838,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.24.9",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.9.tgz",
-      "integrity": "sha512-xm8XrMKz0IlUdocVbYJe0Z9xEgidU7msskG8BbhnTPK/HZ2z/7FP7ykqPgrUH+C+r414mNfNWam1f2vqOjqjYQ==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.2.tgz",
+      "integrity": "sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==",
       "dev": true,
       "dependencies": {
         "@babel/helper-string-parser": "^7.24.8",
@@ -3028,9 +3003,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.14.12",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.12.tgz",
-      "integrity": "sha512-r7wNXakLeSsGT0H1AU863vS2wa5wBOK4bWMjZz2wj+8nBx+m5PeIn0k8AloSLpRuiwdRQZwarZqHE4FNArPuJQ==",
+      "version": "20.14.13",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.13.tgz",
+      "integrity": "sha512-+bHoGiZb8UiQ0+WEtmph2IWQCjIqg8MDZMAV+ppRRhUZnquF5mQkP/9vpSwJClEiSM/C7fZZExPzfU0vJTyp8w==",
       "dev": true,
       "dependencies": {
         "undici-types": "~5.26.4"
@@ -3127,9 +3102,9 @@
       "dev": true
     },
     "node_modules/@types/ws": {
-      "version": "8.5.11",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.11.tgz",
-      "integrity": "sha512-4+q7P5h3SpJxaBft0Dzpbr6lmMaqh0Jr2tbhJZ/luAwvD7ohSCniYkwz/pLxuT2h0EOa6QADgJj1Ko+TzRfZ+w==",
+      "version": "8.5.12",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz",
+      "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
@@ -4625,9 +4600,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001643",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz",
-      "integrity": "sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg==",
+      "version": "1.0.30001645",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001645.tgz",
+      "integrity": "sha512-GFtY2+qt91kzyMk6j48dJcwJVq5uTkk71XxE3RtScx7XWRLsO7bU44LOFkOZYR8w9YMS0UhPSYpN/6rAMImmLw==",
       "dev": true,
       "funding": [
         {
@@ -5756,9 +5731,9 @@
       "dev": true
     },
     "node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
+      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -6198,9 +6173,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.2.tgz",
-      "integrity": "sha512-kc4r3U3V3WLaaZqThjYz/Y6z8tJe+7K0bbjUVo3i+LWIypVdMx5nXCkwRe6SWbY6ILqLdc1rKcKmr3HoH7wjSQ==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz",
+      "integrity": "sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==",
       "dev": true
     },
     "node_modules/elliptic": {
@@ -15692,14 +15667,17 @@
       "peer": true
     },
     "node_modules/url": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz",
-      "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==",
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.4.tgz",
+      "integrity": "sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==",
       "dev": true,
       "peer": true,
       "dependencies": {
         "punycode": "^1.4.1",
-        "qs": "^6.11.2"
+        "qs": "^6.12.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/url/node_modules/punycode": {
diff --git a/package.json b/package.json
index 1054242ba0..bd90a29ef4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "squadcalc",
-  "version": "28.0.3",
+  "version": "28.0.4",
   "description": "A Complete Mortar Calculator for Squad",
   "author": "Maxime 'sharkman' Boussard",
   "license": "MIT",
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index 63919ced2d..76a0005802 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -31,5 +31,8 @@
         "heightDiff": "Height Difference",
     "outOfRange": "Target is out of range :",
     "invalidMortar": "Invalid Weapon",
-    "invalidTarget": "Invalid Target"
+    "invalidTarget": "Invalid Target",
+    "invalidMortarTarget": "Invalid Weapon & Target",
+    "targetOutOfRange": "Target is out of range",
+    "targetTooClose" : "Target is too close"
 }
\ No newline at end of file
diff --git a/public/locales/fr/common.json b/public/locales/fr/common.json
index 81e5266ccf..dfaba4f544 100644
--- a/public/locales/fr/common.json
+++ b/public/locales/fr/common.json
@@ -31,5 +31,8 @@
         "heightDiff": "Différence de hauteur",
     "outOfRange": "La cible est hors de portée :",
     "invalidMortar": "Arme invalide",
-    "invalidTarget": "Cible invalide"
+    "invalidTarget": "Cible invalide",
+    "invalidMortarTarget": "Arme & Cible invalides",
+    "targetOutOfRange": "Cible hors de portée",
+    "targetTooClose" : "Cible trop proche"
 }
diff --git a/public/locales/ru/common.json b/public/locales/ru/common.json
index 676336dc1b..446a37e79c 100644
--- a/public/locales/ru/common.json
+++ b/public/locales/ru/common.json
@@ -31,5 +31,8 @@
         "heightDiff": "Разница высот",
     "outOfRange": "Цель вне дальности:",
     "invalidMortar": "Недействительное оружие",
-    "invalidTarget": "Неверная цель"
+    "invalidTarget": "Неверная цель",
+    "invalidMortarTarget": "Инвалидное оружие и мишень",
+    "targetOutOfRange": "Цель находится вне зоны действия",
+    "targetTooClose" : "Цель слишком близко"
 }
diff --git a/public/locales/uk/common.json b/public/locales/uk/common.json
index 8658cb18ca..dda6e969c1 100644
--- a/public/locales/uk/common.json
+++ b/public/locales/uk/common.json
@@ -31,5 +31,8 @@
         "heightDiff": "Різниця висот",
     "outOfRange": "Ціль знаходиться за межами дальності:",
     "invalidMortar": "Недійсна зброя",
-    "invalidTarget": "Недійсна ціль"
+    "invalidTarget": "Недійсна ціль",
+    "invalidMortarTarget": "Непридатна зброя та мішень",
+    "targetOutOfRange": "Ціль поза зоною досяжності",
+    "targetTooClose" : "Ціль занадто близько"   
 }
diff --git a/public/locales/zh/common.json b/public/locales/zh/common.json
index cc6bd1c217..ed90e9edfb 100644
--- a/public/locales/zh/common.json
+++ b/public/locales/zh/common.json
@@ -31,5 +31,8 @@
         "heightDiff": "高度差",
     "outOfRange": "目标超出射程：",
     "invalidMortar": "无效的武器",
-    "invalidTarget": "无效的目标"
+    "invalidTarget": "无效的目标",
+    "invalidMortarTarget": "取消武器和目标",
+    "targetOutOfRange": "目标超出范围",
+    "targetTooClose" : "目标太近"  
 }
diff --git a/public/maps/gorodok/heightmap.webp b/public/maps/gorodok/heightmap.webp
index f9218b6303..e24e7b5a8e 100644
Binary files a/public/maps/gorodok/heightmap.webp and b/public/maps/gorodok/heightmap.webp differ
diff --git a/src/app.js b/src/app.js
index 21ff9f5610..e05ad01b27 100644
--- a/src/app.js
+++ b/src/app.js
@@ -187,6 +187,8 @@ export function changeWeapon() {
     App.minimap.updateTargets();
 }
 
+
+// TODO, move this  uglyness to squadWeapons.js
 export function changeShell(shell){
 
     if ($(".dropbtn2").val() != 6) { return;}
diff --git a/src/data/maps.js b/src/data/maps.js
index 1a00f844d4..270380fc54 100644
--- a/src/data/maps.js
+++ b/src/data/maps.js
@@ -2,7 +2,6 @@ export const MAPS = [
     { 
         name: "AlBasrah", 
         size: 3040, // OK
-        offset: [0, 0],
         scaling: 0.01294, // OK
         mapURL: "/albasrah/",
         maxZoomLevel: 4,
@@ -10,7 +9,6 @@ export const MAPS = [
     { 
         name: "Anvil", 
         size: 3060, //OK
-        offset: [0, 0], 
         scaling: 0.216675, 
         mapURL: "/anvil/",
         maxZoomLevel: 4,
@@ -18,7 +16,6 @@ export const MAPS = [
     { 
         name: "Belaya", 
         size: 3904, //OK
-        offset: [0, 0], 
         scaling: 0.0726, 
         mapURL: "/belaya/",
         maxZoomLevel: 4,
@@ -26,7 +23,6 @@ export const MAPS = [
     { 
         name: "BlackCoast", 
         size: 4600, // OK but not what mapdata gave us. Maybe because of x scaling?
-        offset: [0, 0], 
         scaling: 0.35, 
         mapURL: "/blackcoast/",
         maxZoomLevel: 4,
@@ -34,7 +30,6 @@ export const MAPS = [
     { 
         name: "Chora", 
         size: 4064, // OK
-        offset: [0, 0], 
         scaling: 0.064, 
         mapURL: "/chora/",
         maxZoomLevel: 4,
@@ -42,7 +37,6 @@ export const MAPS = [
     { 
         name: "Fallujah", 
         size: 3005, // OK
-        offset: [0, 0], 
         scaling: 0.0401, // OK
         mapURL: "/fallujah/",
         maxZoomLevel: 4,
@@ -50,7 +44,6 @@ export const MAPS = [
     { 
         name: "FoolsRoad",
         size: 1774, // OK
-        offset: [0, 0], 
         scaling: 0.21600000000000003,
         mapURL: "/foolsroad/",
         maxZoomLevel: 4,
@@ -58,7 +51,6 @@ export const MAPS = [
     { 
         name: "GooseBay", 
         size: 4031, // OK
-        offset: [0, 0], 
         scaling: 0.22064, // OK
         mapURL: "/goosebay/",
         maxZoomLevel: 4,
@@ -66,15 +58,13 @@ export const MAPS = [
     { 
         name: "Gorodok", 
         size: 4064, // OK
-        offset: [200, 200], 
-        scaling: 0.236,
+        scaling: 0.2, // OK
         mapURL: "/gorodok/",
         maxZoomLevel: 4,
     },
     { 
         name: "Jensen", 
         size: 4008, // OK
-        offset: [0, 0], 
         scaling: 0.0859, // OK
         mapURL: "/jensen/",
         maxZoomLevel: 4,
@@ -82,7 +72,6 @@ export const MAPS = [
     { 
         name: "Harju", 
         size: 4032, // OK
-        offset: [0, 0], 
         scaling: 0.131, // OK
         mapURL: "/harju/",
         maxZoomLevel: 4,
@@ -90,7 +79,6 @@ export const MAPS = [
     { 
         name: "Kamdesh", 
         size: 4032, // OK
-        offset: [0, 0], 
         scaling: 0.190215, 
         mapURL: "/kamdesh/",
         maxZoomLevel: 4,
@@ -98,7 +86,6 @@ export const MAPS = [
     { 
         name: "Kohat", 
         size: 4617, // OK
-        offset: [0, 0], 
         scaling: 0.733125, // OK
         mapURL: "/kohat/",
         maxZoomLevel: 4,
@@ -106,7 +93,6 @@ export const MAPS = [
     { 
         name: "Kokan",
         size: 2496, // OK
-        offset: [0, 0], 
         scaling: 0.0164, 
         mapURL: "/kokan/",
         maxZoomLevel: 4,
@@ -114,7 +100,6 @@ export const MAPS = [
     { 
         name: "Lashkar", 
         size: 4334, // OK
-        offset: [0, 0], 
         scaling: 0.28215, 
         mapURL: "/lashkar/",
         maxZoomLevel: 4,
@@ -122,7 +107,6 @@ export const MAPS = [
     { 
         name: "Logar", 
         size: 1761, // OK
-        offset: [0, 0], 
         scaling: 0.13575, 
         mapURL: "/logar/",
         maxZoomLevel: 4,
@@ -130,7 +114,6 @@ export const MAPS = [
     { 
         name: "Manicouagan", 
         size: 4031, // OK
-        offset: [0, 0], 
         scaling: 0.3564, 
         mapURL: "/manicouagan/",
         maxZoomLevel: 4,
@@ -138,7 +121,6 @@ export const MAPS = [
     { 
         name: "Mestia", 
         size: 2400,
-        offset: [0, 0], 
         scaling: 0.41028, 
         mapURL: "/mestia/",
         maxZoomLevel: 4,
@@ -146,7 +128,6 @@ export const MAPS = [
     { 
         name: "Mutaha", 
         size: 2755, // OK
-        offset: [-70, -100], 
         scaling: 0.07071, 
         mapURL: "/mutaha/",
         maxZoomLevel: 4,
@@ -154,7 +135,6 @@ export const MAPS = [
     { 
         name: "Narva", 
         size: 2800, // OK
-        offset: [-100, -100], 
         scaling: 0.0583, 
         mapURL: "/narva/",
         maxZoomLevel: 4,
@@ -162,7 +142,6 @@ export const MAPS = [
     /*{ 
         name: "Narva (f)", 
         size: 2800, // OK
-        offset: [-100, -100], 
         scaling: 0.0583, 
         mapURL: "/narva-flooded/{z}_{x}_{y}.webp",
         maxZoomLevel: 4,
@@ -170,7 +149,6 @@ export const MAPS = [
     { 
         name: "Sanxian",
         size: 4600, 
-        offset: [0, 0], 
         scaling: 0.1892, 
         mapURL: "/sanxian/",
         maxZoomLevel: 4,
@@ -178,7 +156,6 @@ export const MAPS = [
     { 
         name: "Skorpo", 
         size: 6869, // OK
-        offset: [0, 0], 
         scaling: 1.0927, 
         mapURL: "/skorpo/",
         maxZoomLevel: 4,
@@ -186,7 +163,6 @@ export const MAPS = [
     { 
         name: "Sumari", 
         size: 1300, // OK
-        offset: [0, 0], 
         scaling: 0.035925, 
         mapURL: "/sumari/",
         maxZoomLevel: 4,
@@ -194,7 +170,6 @@ export const MAPS = [
     { 
         name: "Tallil", 
         size: 4680, // OK
-        offset: [-200, -200], 
         scaling: 0.05275, 
         mapURL: "/tallil/",
         maxZoomLevel: 4,
@@ -202,7 +177,6 @@ export const MAPS = [
     { 
         name: "Yehorivka", 
         size: 6350, // Not the SDK values weirdly
-        offset: [-8300, -8300], 
         scaling: 0.3332, 
         mapURL: "/yehorivka/", 
         maxZoomLevel: 4,
diff --git a/src/index.html b/src/index.html
index 92e89527b1..05bbb1cd42 100644
--- a/src/index.html
+++ b/src/index.html
@@ -206,7 +206,7 @@ <h2 data-i18n="settings:SettingsTitle">Settings</h2>
                     <td data-i18n="settings:showMaxRange"></td>
                 </tr>
 
-                <tr>
+                <tr class="cursorChoiceSettings">
                     <td>
                         <label class="mcui-checkbox">
                             <input id="cursorChoiceSettings" type="checkbox">
diff --git a/src/js/ellipse.js b/src/js/ellipse.js
index d30a88430b..4cf5a8259a 100644
--- a/src/js/ellipse.js
+++ b/src/js/ellipse.js
@@ -61,7 +61,6 @@ var Ellipse = Path.extend({
     },
 
     getBounds: function () {
-        // TODO respect tilt (bounds are too big)
         var lngRadius = this._getLngRadius(),
             latRadius = this._getLatRadius(),
             latlng = this._latlng;
diff --git a/src/js/localization.js b/src/js/localization.js
index 132a768a02..099daa3502 100644
--- a/src/js/localization.js
+++ b/src/js/localization.js
@@ -30,7 +30,7 @@ export function loadLanguage() {
         minimumResultsForSearch: -1, // Disable search
     });
 
-    LANGUAGES.forEach(function(lng, i) {
+    LANGUAGES.forEach(function(lng) {
         LANG_SELECTOR.append("<option value=\"" + lng[0] + "\">" + lng[1] + "</option>");
     });
 
diff --git a/src/js/settings.js b/src/js/settings.js
index 0d1fbd5588..6fed112881 100644
--- a/src/js/settings.js
+++ b/src/js/settings.js
@@ -32,7 +32,7 @@ export function loadSettings(){
     }
     else {
         $("#keypadUnderCursorSettingRow").hide();
-        //$("#cursorChoiceSettings").hide();
+        $(".cursorChoiceSettings").hide();
         App.userSettings.keypadUnderCursor = false;
     }
 
@@ -262,7 +262,7 @@ $("#bearingOverDistanceSettings").on("change", function() {
     }
 
     // Update every targets to add/remove distance
-    App.minimap.updateTargets(); // TODO, don't update everything, just the marker content
+    App.minimap.updateTargets();
     updatePreview();
 });
 
diff --git a/src/js/squadFiringSolution.js b/src/js/squadFiringSolution.js
index c0eb0c059e..805622579d 100644
--- a/src/js/squadFiringSolution.js
+++ b/src/js/squadFiringSolution.js
@@ -1,11 +1,6 @@
 import { App } from "./conf";
 import { LatLng } from "leaflet";
 
-
-
-// WIP, currently not using this class
-
-
 export default class SquadFiringSolution {
 
     constructor(weaponLatLng, targetLatLng, map, heightPadding) {
@@ -38,6 +33,7 @@ export default class SquadFiringSolution {
 
     /**
      * Calculate ingame distance between weapon & target
+     * https://github.com/sh4rkman/SquadCalc/wiki/Deducing-distance-and-bearing#finding-distance
      * @return {number} - distance in meter
      */
     getDist(){
@@ -49,6 +45,7 @@ export default class SquadFiringSolution {
     /**
      * Calculates the angle the mortar needs to be set in order
      * to hit the target at the desired distance and vertical delta.
+     * https://github.com/sh4rkman/SquadCalc/wiki/Deducing-Elevation
      * @param {number} [dist] - distance between mortar and target from getDist()
      * @param {number} [vDelta] - vertical delta between mortar and target from getHeight()
      * @param {number} [vel] - initial mortar projectile velocity
@@ -74,6 +71,7 @@ export default class SquadFiringSolution {
 
     /**
      * Calculates the bearing required to see point B from point A.
+     * https://github.com/sh4rkman/SquadCalc/wiki/Deducing-distance-and-bearing#finding-bearing
      * @returns {number} - bearing required to see B from A
      */
     getBearing() {
@@ -100,6 +98,7 @@ export default class SquadFiringSolution {
 
     /**
      * Calculates the horizontal spread for a given trajectory path length 
+     * https://github.com/sh4rkman/SquadCalc/wiki/Deducing-Spread#horizontal-spread
      * @param {number} [angle] - angle of the initial shot in radian
      * @param {number} [vel] - initial mortar projectile velocity in m/s
      * @returns {number} - Length of horizontal spread in meters
@@ -109,11 +108,8 @@ export default class SquadFiringSolution {
         var p1 = 2 * Math.PI * this.getProjectilePathDistance(angle, velocity);
         var p2 = (MOA / 360) * p1;
 
-        if (isNaN(p2)) {
-            return 0;
-        } else {
-            return p2;
-        }
+        if (isNaN(p2)) { return 0; } 
+        return p2;
     }
 
     /**
@@ -133,16 +129,13 @@ export default class SquadFiringSolution {
     /**
      * Calculates the vertical spread of a projectile
      * to hit the target at the desired distance and vertical delta.
+     * https://github.com/sh4rkman/SquadCalc/wiki/Deducing-Spread#vertical-spread
      * @param {number} [angle] - angle of the initial shot
      * @param {number} [vel] - initial mortar projectile velocity in m/s
      * @returns {number} - vertical spread in meter
      */
     getVerticalSpread(angle, vel){
-
         const moa = this.degToRad((App.activeWeapon.moa / 2) / 60);
-    
-        // Apply MOA to found Angle and deduce the spread distance
-        // https://en.wikipedia.org/wiki/Projectile_motion#Maximum_distance_of_projectile
         const verticalSpread1 = (vel ** 2 * Math.sin(2*(angle + moa))) / this.gravity;
         const verticalSpread2  = (vel ** 2 * Math.sin(2*(angle - moa))) / this.gravity;
         const totalSpread = Math.abs(verticalSpread2 - verticalSpread1);
@@ -202,7 +195,4 @@ export default class SquadFiringSolution {
         return deg / (360 / 6400);
     }
 
-
-    
-
 }
diff --git a/src/js/squadGrid.js b/src/js/squadGrid.js
index 357549d657..41b9889b12 100644
--- a/src/js/squadGrid.js
+++ b/src/js/squadGrid.js
@@ -11,7 +11,6 @@ import {
     LayerGroup, Util, LatLng, Polyline, Marker, DivIcon
 } from "leaflet";
 
-import { isMultiple } from "./utils";
 
 /**
  * This Layergroup displays the grid in the same way it is displayed in-game.
@@ -125,10 +124,10 @@ export default LayerGroup.extend({
     },
 
     /**
-   * Updates the opacity for all lines in the lines array to the desired opacity value.
-   * @param {Array} lines - array of lines to update
-   * @param {Number} opacity - desired opacity value
-   */
+    * Updates the opacity for all lines in the lines array to the desired opacity value.
+    * @param {Array} lines - array of lines to update
+    * @param {Number} opacity - desired opacity value
+    */
     setLinesOpacity(lines, opacity = 0.5) {
     // we check only the first object as we are updating all at the same time
     // and this one check might save us iterating through the whole array
@@ -146,10 +145,10 @@ export default LayerGroup.extend({
 
 
     /**
-   * Updates the weight for all lines in the lines array to the desired weight value.
-   * @param {Array} lines - array of lines to update
-   * @param {Number} weight - desired weight value
-   */
+    * Updates the weight for all lines in the lines array to the desired weight value.
+    * @param {Array} lines - array of lines to update
+    * @param {Number} weight - desired weight value
+    */
     setLinesWeight(lines, weight = 1) {
         // we check only the first object as we are updating all at the same time
         // and this one check might save us iterating through the whole array
@@ -166,8 +165,8 @@ export default LayerGroup.extend({
     },
 
     /**
-   * Redraws the grid inside the current view bounds.
-   */
+    * Redraws the grid inside the current view bounds.
+    */
     redraw() {
         
         if (!this.bounds) {
@@ -208,7 +207,7 @@ export default LayerGroup.extend({
             // basically, main style if multiple of 300, sub1 style if multiple of 100,
             // sub2 if multiple of 33
             // we use if-else so that we don't draw lines over each other
-            if (isMultiple(kp, x)) {
+            if (this.isMultiple(kp, x)) {
                 this.kpLines.push(new Polyline([bot, top], this.lineStyleKP));
 
                 // Create
@@ -228,9 +227,9 @@ export default LayerGroup.extend({
 
                 z += 1;
 
-            } else if (isMultiple(s1, x)) {
+            } else if (this.isMultiple(s1, x)) {
                 this.s1Lines.push(new Polyline([bot, top], this.lineStyleSUB1));
-            } else if (isMultiple(s2, x)) {
+            } else if (this.isMultiple(s2, x)) {
                 this.s2Lines.push(new Polyline([bot, top], this.lineStyleSUB2));
             } else {
                 console.warn(`no match! x = ${x}; x%:`, [x % kp, x % s1, x % s2]); // this should never happen
@@ -246,7 +245,7 @@ export default LayerGroup.extend({
             const right = new LatLng(y, this.bounds.getEast());
 
 
-            if (isMultiple(kp, y)) {
+            if (this.isMultiple(kp, y)) {
                 let textPos = new LatLng(y+(kp/2), this.bounds.getWest());
                 this.kpLines.push(new Polyline([left, right], this.lineStyleKP));
 
@@ -263,9 +262,9 @@ export default LayerGroup.extend({
                 }
                 z+=1;
 
-            } else if (isMultiple(s1, y)) {
+            } else if (this.isMultiple(s1, y)) {
                 this.s1Lines.push(new Polyline([left, right], this.lineStyleSUB1));
-            } else if (isMultiple(s2, y)) {
+            } else if (this.isMultiple(s2, y)) {
                 this.s2Lines.push(new Polyline([left, right], this.lineStyleSUB2));
             } else {
                 console.warn(`no match! y = ${y}; y%:`, [y % kp, y % s1, y % s2]);
@@ -285,4 +284,17 @@ export default LayerGroup.extend({
             document.querySelectorAll(".gridText")[i].setAttribute("tabindex", "-1");
         }
     },
+    
+    /**
+     * Returns true if 'a' is a multiple of 'b' with a precision up to 4 decimals
+     * @param a
+     * @param b
+     * @returns {boolean} true if 'a' is a multiple of 'b', false otherwise              
+     */
+    isMultiple(a, b) {
+        const t = b / a;
+        const r = Math.round(t);
+        const d = t >= r ? t - r : r - t;
+        return d < 0.0001;
+    }
 });
diff --git a/src/js/squadSimulation.js b/src/js/squadSimulation.js
index e4b7865c41..d3339227a5 100644
--- a/src/js/squadSimulation.js
+++ b/src/js/squadSimulation.js
@@ -1,6 +1,5 @@
 import targetIcon from "../img/icons/marker_target_enabled.webp";
 import targetIconDisabled from "../img/icons/marker_target_disabled.webp";
-import { degToRad } from "../js/utils.js";
 import { App } from "./conf.js";
 import i18next from "i18next";
 
@@ -204,7 +203,8 @@ export default class Simulation {
         var this2 = this;
 
         if (isNaN(this.firingSolution.elevation.high.rad)) {
-            elevation = degToRad(45);
+            // if no firing solution, simulate a maxdisance shot
+            elevation = 0,785398;
         } else {
             if (this.angleType === "high") {
                 elevation = this.firingSolution.elevation.high.rad;
diff --git a/src/js/squadWeapons.js b/src/js/squadWeapons.js
index 63620cb869..4326e61b06 100644
--- a/src/js/squadWeapons.js
+++ b/src/js/squadWeapons.js
@@ -59,6 +59,10 @@ export class Weapon {
         return this.velocity.slice(-1)[0][0];
     }
 
+    /**
+     * Return distance at which will be dealt given damage
+     * https://github.com/sh4rkman/SquadCalc/wiki/Deducing-Damage-Radius
+     */
     calculateDistanceForDamage(maxDamage, startRadius, endRadius, falloff, distanceFromImpact, targetDamage) {
         var characterSize = 1.8;
         var radius = endRadius - (Math.pow(targetDamage / maxDamage, 1 / falloff) * (endRadius - startRadius));
diff --git a/src/js/tests/mapdata.js b/src/js/tests/mapdata.js
index d49ae7df0d..aaee82db80 100644
--- a/src/js/tests/mapdata.js
+++ b/src/js/tests/mapdata.js
@@ -294,7 +294,7 @@ const MAPDATA = [
       },
       extra: {
         scale: [1, 1, 10],
-        levels: [780, 899],
+        levels: [750, 950],
         minimap: [
           [-2032, -2032],
           [2032, 2032],
diff --git a/src/js/utils.js b/src/js/utils.js
index 3d4cfa2d79..2444e30261 100644
--- a/src/js/utils.js
+++ b/src/js/utils.js
@@ -1,8 +1,9 @@
 import { tooltip_save, tooltip_copied } from "./tooltips";
 import { App } from "./conf";
-import { MAPS } from "../data/maps";
 import { animateCSS, animateCalc} from "./animations";
 import { LatLng } from "leaflet";
+import i18next from "i18next";
+import SquadFiringSolution from "./squadFiringSolution";
 
 /**
  * Returns the latlng coordinates based on the given keypad string.
@@ -94,129 +95,6 @@ export function getBearing(a, b) {
     return bearing;
 }
 
-/**
- * Converts radians into NATO mils
- * @param {number} rad - radians
- * @returns {number} NATO mils
- */
-export function radToMil(rad) {
-    return degToMil(radToDeg(rad));
-}
-
-/**
- * Converts degrees to radians
- * @param {number} deg - degrees
- * @returns {number} radians
- */
-export function degToRad(deg) {
-    return (deg * Math.PI) / 180;
-}
-
-/**
- * Converts radians into degrees
- * @param {number} rad - radians
- * @returns {number} degrees
- */
-export function radToDeg(rad) {
-    return (rad * 180) / Math.PI;
-}
-
-/**
- * Converts degrees into NATO mils
- * @param {number} deg - degrees
- * @returns {number} NATO mils
- */
-function degToMil(deg) {
-    return deg / (360 / 6400);
-}
-
-/**
- * Calculates the distance between two points.
- * @param {LatLng} a - point A
- * @param {LatLng} b - point B
- * @returns {number} distance A <-> B
- */
-export function getDist(a, b) {
-    return Math.hypot(a.lat - b.lat, a.lng - b.lng);
-}
-
-/**
- * Calculates the angle the mortar needs to be set in order
- * to hit the target at the desired distance and vertical delta.
- * @param {number} [dist] - distance between mortar and target from getDist()
- * @param {number} [vDelta] - vertical delta between mortar and target from getHeight()
- * @param {number} [vel] - initial mortar projectile velocity
- * @returns {number || NaN} radian angle if target in range, NaN otherwise
- */
-export function getElevation(dist = 0, vDelta = 0, vel = 0) {
-    var padding = 0;
-    const GRAVITY = App.gravity * App.activeWeapon.gravityScale;
-    const P1 = Math.sqrt(vel ** 4 - GRAVITY * (GRAVITY * dist ** 2 + 2 * vDelta * vel ** 2));
-
-    if (App.activeWeapon.name === "Tech. Mortar"){
-        // The technical mortar is bugged : the ingame range metter is off by 5°
-        // Ugly fix until OWI correct it
-        padding = -0.0872665;
-    }
-
-    return padding + Math.atan((vel ** 2 - (P1 * App.activeWeapon.getAngleType())) / (GRAVITY * dist));
-}
-
-/**
- * Apply current map offset to given position
- *
- * @param {lat;lng} pos - position
- * @returns {lat;lng} - offset position
- */
-export function getOffsetLatLng(pos) {
-    const mapScale = App.canvas.size / MAPS.find((elem, index) => index == App.activeMap).size;
-    return {
-        lat: (pos.lat + MAPS.find((elem, index) => index == App.activeMap).offset[0] * mapScale) * mapScale,
-        lng: (pos.lng + MAPS.find((elem, index) => index == App.activeMap).offset[1] * mapScale) * mapScale
-    };
-}
-
-/**
- * Calculates the height difference between mortar and target
- *
- * @param {Number} a - {lat;lng} where mortar is
- * @param {Number} b - {lat;lng} where target is
- * @returns {number} - relative height in meters
- */
-export function getHeight(a, b) {
-    var Aheight;
-    var Bheight;
-    var AOffset;
-    var BOffset;
-    var ctx = document.getElementById("canvas").getContext("2d");
-
-    // if user didn't select map, no height calculation
-    if (!App.activeMap) { return 0; }
-
-    // Apply offset & scaling
-    // Heightmaps & maps doesn't always start at A01, they sometimes need to be offset manually
-    AOffset = getOffsetLatLng(a);
-    BOffset = getOffsetLatLng(b);
-
-
-    // Read Heightmap color values for a & b
-    Aheight = ctx.getImageData(Math.round(AOffset.lat), Math.round(AOffset.lng), 1, 1).data;
-    Bheight = ctx.getImageData(Math.round(BOffset.lat), Math.round(BOffset.lng), 1, 1).data;
-
-    // Check if a & b aren't out of canvas
-    if (Aheight[2] === 0 && Aheight[0] === 0) {
-        return "AERROR";
-    }
-    if (Bheight[2] === 0 && Bheight[0] === 0) {
-        return "BERROR";
-    }
-
-    Aheight = (255 + Aheight[0] - Aheight[2]) * MAPS.find((elem, index) => index == App.activeMap).scaling;
-    Bheight = (255 + Bheight[0] - Bheight[2]) * MAPS.find((elem, index) => index == App.activeMap).scaling;
-
-    return Bheight - Aheight;
-}
-
 /**
  * Reset UI to default
  */
@@ -246,20 +124,14 @@ function resetCalc() {
 export function shoot(inputChanged = "") {
     var startA;
     var startB;
-    var height;
-    var heightB;
-    var heightA;
-    var distance;
     var elevation;
-    var bearing;
-    var vel;
+    var firingSolution;
     const MORTAR_LOC = $("#mortar-location");
     const TARGET_LOC = $("#target-location");
     var a = MORTAR_LOC.val();
     var b = TARGET_LOC.val();
     var aPos;
     var bPos;
-    const mapScale = App.mapSize / MAPS.find((elem, index) => index == App.activeMap).size;
 
     resetCalc();
 
@@ -286,71 +158,62 @@ export function shoot(inputChanged = "") {
     aPos = getPos(a);
     bPos = getPos(b);
 
-
-
     if (Number.isNaN(aPos.lng) || Number.isNaN(bPos.lng)) {
-
         if (Number.isNaN(aPos.lng) && Number.isNaN(bPos.lng)) {
-            showError("Invalid mortar and target");
+            showError("<div data-i18n='common:invalidMortarTarget'>" + i18next.t("common:invalidMortarTarget") + "</div>");
         } else if (Number.isNaN(aPos.lng)) {
-            showError("Invalid mortar", "mortar");
+            showError("<div data-i18n='common:invalidMortar'>" + i18next.t("common:invalidMortar") + "</div>", "mortar");
         } else {
-            showError("Invalid target", "target");
+            showError("<div data-i18n='common:invalidTarget'>" + i18next.t("common:invalidTarget") + "</div>", "target");
         }
         return 1;
     }
 
-    heightA = App.minimap.heightmap.getHeight(new LatLng(aPos.lng * -mapScale, aPos.lat * mapScale));
-    heightB = App.minimap.heightmap.getHeight(new LatLng(bPos.lng * -mapScale, bPos.lat * mapScale));
-    height = heightB - heightA;
+    aPos = new LatLng(-aPos.lng * App.minimap.gameToMapScale, aPos.lat * App.minimap.gameToMapScale);
+    bPos = new LatLng(-bPos.lng * App.minimap.gameToMapScale, bPos.lat * App.minimap.gameToMapScale);
 
-    distance = getDist(aPos, bPos);
-    bearing = getBearing(aPos, bPos);
-    vel = App.activeWeapon.getVelocity(distance);
-    elevation = getElevation(distance, height, vel);
+    firingSolution = new SquadFiringSolution(aPos, bPos, App.minimap, 0);
 
+    if (App.activeWeapon.getAngleType() === -1) {
+        elevation = firingSolution.elevation.high;
+    } else {
+        elevation = firingSolution.elevation.low;
+    }
 
     if (App.activeWeapon.unit === "mil") {
-        elevation = radToMil(elevation);
+        elevation = elevation.mil;
     } else {
-        elevation = radToDeg(elevation);
-        // The technical mortar is bugged : the ingame range metter is off by 5°
-        // Ugly fix until OWI correct it
-        if (App.activeWeapon.name === "Technical") { elevation = elevation - 5; }
+        elevation = elevation.deg;
     }
 
-
+    if (App.activeWeapon.getAngleType() === -1) {
+        if (elevation > App.activeWeapon.minElevation[1]) {
+            showError("<span data-i18n='common:targetTooClose'>" + i18next.t("common:targetTooClose") + "</span> : " + firingSolution.distance.toFixed(0) + "<span data-i18n='common:m'>" + i18next.t("common:m") + "</span>", "target");
+            return 1;
+        }
+    } else {
+        if (elevation < App.activeWeapon.minElevation[0]) {
+            showError("<span data-i18n='common:targetTooClose'>" + i18next.t("common:targetTooClose") + "</span> : " + firingSolution.distance.toFixed(0) + "<span data-i18n='common:m'>" + i18next.t("common:m") + "</span>", "target");
+            return 1;
+        }  
+    }
+    
     // If Target too far, display it and exit function
     if (Number.isNaN(elevation)) {
-        showError("Target is out of range : " + distance.toFixed(0) + "m", "target");
+        showError("<span data-i18n='common:targetOutOfRange'>" + i18next.t("common:targetOutOfRange") + "</span> : " + firingSolution.distance.toFixed(0) + "<span data-i18n='common:m'>" + i18next.t("common:m") + "</span>", "target");
         return 1;
     }
 
-
-    if ((elevation > App.activeWeapon.minElevation[1])) {
-        showError("Target is too close : " + distance.toFixed(0) + "m", "target");
-        return 1;
-    }
-    
-    insertCalc(bearing, elevation, distance, vel, height);
+    insertCalc(firingSolution.bearing, elevation, firingSolution.distance);
 
 }
 
 /**
  * Insert Calculations into html
- *
  * @param {number} bearing 
  * @param {number} elevation 
- * @param {number} distance 
- * @param {number} vel 
- * @param {number} height 
  */
-function insertCalc(bearing, elevation, distance, vel, height) {
-
-    console.log(`${$("#mortar-location").val()} -> ${$("#target-location").val()}`);
-    console.log(`-> Bearing: ${bearing.toFixed(1)}° - Elevation: ${elevation.toFixed(1)}↷`);
-    console.log(`-> Distance: ${distance.toFixed(0)}m - height: ${height.toFixed(0)}m`);
-    console.log(`-> Velocity: ${vel.toFixed(1)}m/s`);
+function insertCalc(bearing, elevation) {
 
     animateCalc($("#bearingNum").html(),bearing.toFixed(1),500,"bearingNum");
     animateCalc($("#elevationNum").html(),elevation.toFixed(App.activeWeapon.elevationPrecision),500,"elevationNum");
@@ -412,7 +275,7 @@ export function filterInput(e) {
 
 /**
  * Display error in html & console
- * @param {string} msg - error message to be displayed
+ * @param {string} msg - error message code to be displayed
  * @param {string} issue - mortar/target/both
  */
 function showError(msg, issue) {
@@ -428,15 +291,14 @@ function showError(msg, issue) {
     // Rework the #setting div to display a single message
     $("#bearing").addClass("hidden").removeClass("pure-u-10-24");
     $("#elevation").addClass("hidden").removeClass("pure-u-10-24");
-    $("#errorMsg").removeClass("pure-u-4-24").addClass("pure-u-1").addClass("errorMsg").html(msg);
+    $("#errorMsg").removeClass("pure-u-4-24").addClass("pure-u-1").addClass("errorMsg");
+    $("#errorMsg").html(msg);
 
     // remove the pointer cursor & tooltip
     $("#copy").removeClass("copy");
     $("#settings").css({ "border-color": "firebrick" });
     animateCSS($("#settings"), "shakeX");
 
-    console.clear();
-    console.error(msg);
 }
 
 
@@ -459,9 +321,9 @@ export function copySave(COPY_ZONE) {
 
 /**
  * Copy string to clipboard
- * execCommand is deprecated but navigator.clipboard doesn't work in steam browser
  */
 function copy(string) {
+    // execCommand is deprecated but navigator.clipboard doesn't work in steam browser
     const el = document.createElement("textarea");
     el.value = string;
     el.setAttribute("readonly", "");
@@ -594,17 +456,16 @@ export function saveCalc() {
  * Copy current calc to clipboard
  * @param {event} e - click event that triggered copy
  */
-export function copyCalc() {
+export function copyCalc(e) {
     
     // If calcs aren't ready, do nothing
     if (!$(".copy").hasClass("copy")) { return 1; }
 
-    // // When using BM-21, and the target icon is clicked, do nothing
-    // if (App.activeWeapon.name != "mortar" || App.activeWeapon.name != "B-32") {
-    //     if ($(e.target).hasClass("fa-sort-amount-down") || $(e.target).hasClass("fa-sort-amount-up") ) {
-    //         return 1;
-    //     }
-    // }
+    if ($(e.target).hasClass("fa-sort-amount-down") || $(e.target).hasClass("fa-sort-amount-up") ) {
+        if (!$(e.target).hasClass("active")) {
+            return 1;
+        }
+    }
 
     animateCSS($(".copy"), "headShake");
 
@@ -625,22 +486,6 @@ export function changeHighLow(){
     shoot();
 }
 
-
-/**
- * Returns true if 'a' is a multiple of 'b' with a precision up to 4 decimals
- *
- * @param a
- * @param b
- * @returns {boolean} true if 'a' is a multiple of 'b', false otherwise              
- */
-export function isMultiple(a, b) {
-    const t = b / a;
-    const r = Math.round(t);
-    const d = t >= r ? t - r : r - t;
-    return d < 0.0001;
-}
-
-
 /**
  * Calculates the keypad coordinates for a given latlng coordinate, e.g. "A5-3-7"
  * @param lat - latitude coordinate
@@ -741,14 +586,6 @@ export function pad(num, size) {
     return `0000${num}`.substr(-size);
 }
 
-
-
-
-
-
-
-
-
 export function isTouchDevice() {
     return (("ontouchstart" in window) ||
        (navigator.maxTouchPoints > 0) ||