diff --git a/client/@types/olympus/index.d.ts b/client/@types/olympus/index.d.ts
index 11be7280..faa3f853 100644
--- a/client/@types/olympus/index.d.ts
+++ b/client/@types/olympus/index.d.ts
@@ -151,8 +151,8 @@ declare module "constants/constants" {
     export const mapLayers: {
         "ArcGIS Satellite": {
             urlTemplate: string;
-            maxZoom: number;
             minZoom: number;
+            maxZoom: number;
             attribution: string;
         };
         "USGS Topo": {
@@ -222,8 +222,8 @@ declare module "constants/constants" {
         position = 13,
         speed = 14,
         heading = 15,
-        isTanker = 16,
-        isAWACS = 17,
+        isActiveTanker = 16,
+        isActiveAWACS = 17,
         onOff = 18,
         followRoads = 19,
         fuel = 20,
@@ -499,8 +499,8 @@ declare module "interfaces" {
         position: LatLng;
         speed: number;
         heading: number;
-        isTanker: boolean;
-        isAWACS: boolean;
+        isActiveTanker: boolean;
+        isActiveAWACS: boolean;
         onOff: boolean;
         followRoads: boolean;
         fuel: number;
@@ -1037,8 +1037,8 @@ declare module "unit/unit" {
         getPosition(): LatLng;
         getSpeed(): number;
         getHeading(): number;
-        getIsTanker(): boolean;
-        getIsAWACS(): boolean;
+        getIsActiveTanker(): boolean;
+        getIsActiveAWACS(): boolean;
         getOnOff(): boolean;
         getFollowRoads(): boolean;
         getFuel(): number;
@@ -1097,6 +1097,8 @@ declare module "unit/unit" {
         isInViewport(): boolean;
         canTargetPoint(): boolean;
         canRearm(): boolean;
+        isTanker(): boolean;
+        isAWACS(): boolean;
         /********************** Unit commands *************************/
         addDestination(latlng: L.LatLng): void;
         clearDestinations(): void;
@@ -1121,7 +1123,7 @@ declare module "unit/unit" {
         setOperateAs(operateAs: string): void;
         delete(explosion: boolean, immediate: boolean): void;
         refuel(): void;
-        setAdvancedOptions(isTanker: boolean, isAWACS: boolean, TACAN: TACAN, radio: Radio, generalSettings: GeneralSettings): void;
+        setAdvancedOptions(isActiveTanker: boolean, isActiveAWACS: boolean, TACAN: TACAN, radio: Radio, generalSettings: GeneralSettings): void;
         bombPoint(latlng: LatLng): void;
         carpetBomb(latlng: LatLng): void;
         bombBuilding(latlng: LatLng): void;
@@ -2064,7 +2066,7 @@ declare module "server/servermanager" {
         scenicAAA(ID: number, coalition: string, callback?: CallableFunction): void;
         missOnPurpose(ID: number, coalition: string, callback?: CallableFunction): void;
         landAtPoint(ID: number, latlng: LatLng, callback?: CallableFunction): void;
-        setAdvacedOptions(ID: number, isTanker: boolean, isAWACS: boolean, TACAN: TACAN, radio: Radio, generalSettings: GeneralSettings, callback?: CallableFunction): void;
+        setAdvacedOptions(ID: number, isActiveTanker: boolean, isActiveAWACS: boolean, TACAN: TACAN, radio: Radio, generalSettings: GeneralSettings, callback?: CallableFunction): void;
         setCommandModeOptions(restrictSpawns: boolean, restrictToCoalition: boolean, spawnPoints: {
             blue: number;
             red: number;
diff --git a/client/package.json b/client/package.json
index 968b1b71..0007e31b 100644
--- a/client/package.json
+++ b/client/package.json
@@ -5,7 +5,7 @@
   "version": "v0.4.5-alpha",
   "private": true,
   "scripts": {
-	 "build": "browserify ./src/index.ts -p [ tsify --noImplicitAny] > index.js && copy.bat",
+	  "build": "browserify .\\src\\index.ts --debug -o .\\public\\javascripts\\bundle.js -t [ babelify --global true --presets [ @babel/preset-env ] --extensions '.js'] -p [ tsify --noImplicitAny ] && copy.bat",
     "emit-declarations": "tsc --project tsconfig.json --declaration --emitDeclarationOnly --outfile ./@types/olympus/index.d.ts",
     "copy": "copy.bat",
     "start": "npm run copy & concurrently --kill-others \"npm run watch\" \"nodemon --ignore ./public/databases/ ./bin/www\"",
diff --git a/client/prepare.bat b/client/prepare.bat
deleted file mode 100644
index f163f70e..00000000
--- a/client/prepare.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-copy .\\node_modules\\leaflet\\dist\\leaflet.css .\\public\\stylesheets\\leaflet\\leaflet.css 
-copy .\\node_modules\\leaflet.nauticscale\\dist\\leaflet.nauticscale.js .\\public\\javascripts\\leaflet.nauticscale.js