diff --git a/src/components/Content/Physics.tsx b/src/components/Content/Physics.tsx
index e2e665937..833fecd65 100644
--- a/src/components/Content/Physics.tsx
+++ b/src/components/Content/Physics.tsx
@@ -10,7 +10,7 @@ interface PhysicsProps {
   modifyScenarioProperty: typeof modifyScenarioProperty;
   masses: MassType[];
   integrator: string;
-  useBarnesHut?: boolean;
+  useBarnesHut: boolean;
   systemBarycenter: boolean;
   collisions: boolean;
   dt: number;
@@ -73,7 +73,6 @@ export default ({
             dropdownWrapperCssClassName="tabs-dropdown-wrapper"
             selectedOptionCssClassName="selected-option"
             optionsWrapperCssClass="options"
-            dynamicChildrenLen={masses.length}
           >
             {masses.map(mass => (
               <div
@@ -102,7 +101,6 @@ export default ({
             dropdownWrapperCssClassName="tabs-dropdown-wrapper"
             selectedOptionCssClassName="selected-option"
             optionsWrapperCssClass="options"
-            dynamicChildrenLen={masses.length}
           >
             {masses.map(mass => (
               <div
@@ -133,7 +131,6 @@ export default ({
         selectedOptionCssClassName="selected-option"
         dropdownWrapperCssClassName="tabs-dropdown-wrapper"
         optionsWrapperCssClass="options"
-        dynamicChildrenLen={integrators.length}
       >
         {integrators.map(integrator => (
           <div
diff --git a/src/components/Head/index.tsx b/src/components/Head/index.tsx
index a69e5ad32..ae8796364 100644
--- a/src/components/Head/index.tsx
+++ b/src/components/Head/index.tsx
@@ -7,7 +7,7 @@ interface HeadProps {
   pageDescription: string;
   pathName: string;
   bodyCssClass?: string;
-  pageType: string;
+  pageType?: string;
   image?: string;
   fileName?: string;
 }
@@ -76,7 +76,7 @@ export default ({
             description: pageDescription,
             about: {
               "@type": "Thing",
-              description: "gravity, simulation, space" 
+              description: "gravity, simulation, space"
             },
             creator: {
               "@type": "Person",
diff --git a/src/components/Header/index.tsx b/src/components/Header/index.tsx
index 9c56ec8d9..f248a1f6f 100644
--- a/src/components/Header/index.tsx
+++ b/src/components/Header/index.tsx
@@ -9,7 +9,7 @@ import "./Header.less";
 interface HeaderProps {
   pageTitle: string;
   pageDescription: string;
-  pageType: string;
+  pageType?: string;
   image?: string;
   location: any;
 }
diff --git a/src/components/LazyDog/LazyDog.less b/src/components/LazyDog/LazyDog.less
deleted file mode 100644
index 4cf88ce42..000000000
--- a/src/components/LazyDog/LazyDog.less
+++ /dev/null
@@ -1,36 +0,0 @@
-.lazy-dog-wrapper {
-  position: relative;
-  overflow: hidden;
-  border: 1px solid #545454;
-  background-color: #000;
-  text-align: center;
-  &:hover {
-    font-weight: bold;
-  }
-  min-height: 100px;
-  p {
-    width: 85%;
-    position: absolute;
-    left: 50%;
-    font-size: 11px;
-    transform: translateX(-50%);
-    bottom: 0;
-  }
-  i {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-  }
-  img {
-    opacity: 0;
-    transition: opacity 1s;
-  }
-  .loaded-image {
-    opacity: 1;
-  }
-}
-
-.lazy-dog-wrapper:hover {
-  box-shadow: 0px 0px 3px skyblue;
-}
diff --git a/src/components/LazyDog/index.tsx b/src/components/LazyDog/index.tsx
deleted file mode 100644
index fbc3d16e9..000000000
--- a/src/components/LazyDog/index.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import React, { ReactElement, useState } from "react";
-import "./LazyDog.less";
-
-interface LazyDogProps {
-  src: string;
-  alt: string;
-  width?: number;
-  height?: number;
-  caption: string;
-  placeHolderIcon: string;
-}
-
-export default ({
-  src,
-  alt,
-  width,
-  height,
-  caption,
-  placeHolderIcon
-}: LazyDogProps): ReactElement => {
-  const [loading, setLoading] = useState(true);
-
-  return (
-    <div className="lazy-dog-wrapper">
-      <img
-        onLoad={() => setLoading(false)}
-        src={src}
-        alt={alt}
-        width={width}
-        height={height}
-        className={!loading && "loaded-image"}
-        style={{ width: !width && "100%" }}
-      />
-      <p>{caption}</p>
-      {loading && <i className={placeHolderIcon} />}
-    </div>
-  );
-};
diff --git a/src/components/Modal/index.tsx b/src/components/Modal/index.tsx
index 1769540a4..c6670556d 100644
--- a/src/components/Modal/index.tsx
+++ b/src/components/Modal/index.tsx
@@ -1,16 +1,11 @@
-import React, {
-  ReactElement,
-  MouseEvent,
-  ReactChildren,
-  ReactChild
-} from "react";
+import React, { ReactElement, MouseEvent, ReactNode } from "react";
 import "./Modal.less";
 
 interface ModalProps {
-  children: ReactChildren | ReactChild;
+  children: ReactNode;
   callback: (event: MouseEvent<HTMLButtonElement>) => void;
   modalWrapperCssClass: string;
-  modalCssClass: string;
+  modalCssClass?: string;
 }
 
 export default ({
diff --git a/src/components/Pagination/index.tsx b/src/components/Pagination/index.tsx
index b87c09f9b..b59c5512c 100644
--- a/src/components/Pagination/index.tsx
+++ b/src/components/Pagination/index.tsx
@@ -15,14 +15,8 @@ interface PaginationProps {
   };
 }
 
-export default ({
-  itemsPerPage,
-  pagination
-}: PaginationProps): ReactElement => {
-  const renderRange = (
-    range: { start: number; end: number },
-    itemsPerPage: number
-  ) => {
+export default ({ pagination }: PaginationProps): ReactElement => {
+  const renderRange = (range: { start: number; end: number }) => {
     const items = [
       <Link to={pagination.path}>
         <NavItem key="pagination-first-page">First Page</NavItem>
@@ -49,10 +43,7 @@ export default ({
 
   return (
     <Nav css={{ border: "none", borderBottom: "1px solid #545454" }}>
-      {renderRange(
-        getPaginationRange(pagination.page, pagination.count),
-        itemsPerPage
-      )}
+      {renderRange(getPaginationRange(pagination.page, pagination.count))}
     </Nav>
   );
 };
diff --git a/src/components/Renderer/ForAllMankindRenderer.tsx b/src/components/Renderer/ForAllMankindRenderer.tsx
index 831e6ff72..243c9a52c 100644
--- a/src/components/Renderer/ForAllMankindRenderer.tsx
+++ b/src/components/Renderer/ForAllMankindRenderer.tsx
@@ -1,7 +1,6 @@
 import React, { memo, ReactElement, useEffect, Fragment, useRef } from "react";
 import forAllMankindScene from "../../scene/forAllMankindScene";
 import "./Renderer.less";
-import { resetScenario } from "../../state/creators/scenario";
 
 interface RendererProps {
   scenarioName: string;
@@ -11,20 +10,18 @@ export default memo(
   ({ scenarioName }: RendererProps): ReactElement => {
     const graphics2DCanvas = useRef(null);
     const webGlCanvas = useRef(null);
-    const audio = useRef(null);
 
     useEffect(() => {
       scenarioName &&
         forAllMankindScene
           .reset()
-          .init(webGlCanvas.current, graphics2DCanvas.current, audio.current);
+          .init(webGlCanvas.current, graphics2DCanvas.current);
     });
 
     return (
       <Fragment>
         <canvas ref={webGlCanvas} />
         <canvas ref={graphics2DCanvas} className="graphics-2d-canvas" />
-        <audio ref={audio} style={{ display: "none" }} />
       </Fragment>
     );
   },
diff --git a/src/components/Renderer/index.tsx b/src/components/Renderer/index.tsx
index 97394dc83..f5b488335 100755
--- a/src/components/Renderer/index.tsx
+++ b/src/components/Renderer/index.tsx
@@ -1,7 +1,6 @@
 import React, { memo, ReactElement, useEffect, Fragment, useRef } from "react";
 import scene from "../../scene";
 import "./Renderer.less";
-import { resetScenario } from "../../state/creators/scenario";
 
 interface RendererProps {
   scenarioName: string;
@@ -11,20 +10,16 @@ export default memo(
   ({ scenarioName }: RendererProps): ReactElement => {
     const graphics2DCanvas = useRef(null);
     const webGlCanvas = useRef(null);
-    const audio = useRef(null);
 
     useEffect(() => {
       scenarioName &&
-        scene
-          .reset()
-          .init(webGlCanvas.current, graphics2DCanvas.current, audio.current);
+        scene.reset().init(webGlCanvas.current, graphics2DCanvas.current);
     });
 
     return (
       <Fragment>
         <canvas ref={webGlCanvas} />
         <canvas ref={graphics2DCanvas} className="graphics-2d-canvas" />
-        <audio ref={audio} style={{ display: "none" }} />
       </Fragment>
     );
   },
diff --git a/src/components/Simulator/Simulator.tsx b/src/components/Simulator/Simulator.tsx
index 126eed882..a3e2d48f5 100755
--- a/src/components/Simulator/Simulator.tsx
+++ b/src/components/Simulator/Simulator.tsx
@@ -183,9 +183,9 @@ export default ({
                 }}
                 className="iframe-scroll-wrapper"
               />
-            ) : (
+            ) : scenarioWikiUrl ? (
               <Iframe url={scenarioWikiUrl} />
-            )}
+            ) : null}
           </Modal>
         )}
       </ReactCSSTransitionGroup>
diff --git a/src/components/Simulator/StarshipSimulator.tsx b/src/components/Simulator/StarshipSimulator.tsx
index 133cf4e6a..55ef74053 100644
--- a/src/components/Simulator/StarshipSimulator.tsx
+++ b/src/components/Simulator/StarshipSimulator.tsx
@@ -10,12 +10,7 @@ import "./StarshipSimulator.less";
 interface SimulatorProps {
   scenario: ScenarioState;
   modifyScenarioProperty: typeof scenarioActionCreators.modifyScenarioProperty;
-  modifyMassProperty: typeof scenarioActionCreators.modifyMassProperty;
-  deleteMass: typeof scenarioActionCreators.deleteMass;
-  addMass: typeof scenarioActionCreators.addMass;
-  resetScenario: typeof scenarioActionCreators.resetScenario;
   getTrajectory: typeof scenarioActionCreators.getTrajectory;
-  app: any;
 }
 
 export default ({
diff --git a/src/components/Spaceship/index.tsx b/src/components/Spaceship/index.tsx
index 2518c3e5d..428b35cb9 100644
--- a/src/components/Spaceship/index.tsx
+++ b/src/components/Spaceship/index.tsx
@@ -90,11 +90,11 @@ export default ({
         39.5 * spacecraft.currentSOI.m
       );
 
-      orbitalElements.a = orbitalElements.a.toFixed(5);
-      orbitalElements.e = orbitalElements.e.toFixed(5);
-      orbitalElements.i = orbitalElements.i.toFixed(5);
-      orbitalElements.argP = orbitalElements.argP.toFixed(5);
-      orbitalElements.lAn = orbitalElements.lAn.toFixed(5);
+      orbitalElements.a = parseFloat(orbitalElements.a.toFixed(5));
+      orbitalElements.e = parseFloat(orbitalElements.e.toFixed(5));
+      orbitalElements.i = parseFloat(orbitalElements.i.toFixed(5));
+      orbitalElements.argP = parseFloat(orbitalElements.argP.toFixed(5));
+      orbitalElements.lAn = parseFloat(orbitalElements.lAn.toFixed(5));
 
       const { name } = currentSOI;
 
@@ -110,11 +110,13 @@ export default ({
         orbitalElements,
         currentSOI,
         targetSOI: radiusSOI(scenario.masses[1], target),
-        velocity: getVelocityMagnitude({
-          x: spacecraftMass.vx,
-          y: spacecraftMass.vy,
-          z: spacecraftMass.vz
-        }).toFixed(5)
+        velocity: parseFloat(
+          getVelocityMagnitude({
+            x: spacecraftMass.vx,
+            y: spacecraftMass.vy,
+            z: spacecraftMass.vz
+          }).toFixed(5)
+        )
       });
 
       modifyScenarioProperty({
diff --git a/src/components/spaceship/index.tsx b/src/components/spaceship/index.tsx
index 2518c3e5d..428b35cb9 100644
--- a/src/components/spaceship/index.tsx
+++ b/src/components/spaceship/index.tsx
@@ -90,11 +90,11 @@ export default ({
         39.5 * spacecraft.currentSOI.m
       );
 
-      orbitalElements.a = orbitalElements.a.toFixed(5);
-      orbitalElements.e = orbitalElements.e.toFixed(5);
-      orbitalElements.i = orbitalElements.i.toFixed(5);
-      orbitalElements.argP = orbitalElements.argP.toFixed(5);
-      orbitalElements.lAn = orbitalElements.lAn.toFixed(5);
+      orbitalElements.a = parseFloat(orbitalElements.a.toFixed(5));
+      orbitalElements.e = parseFloat(orbitalElements.e.toFixed(5));
+      orbitalElements.i = parseFloat(orbitalElements.i.toFixed(5));
+      orbitalElements.argP = parseFloat(orbitalElements.argP.toFixed(5));
+      orbitalElements.lAn = parseFloat(orbitalElements.lAn.toFixed(5));
 
       const { name } = currentSOI;
 
@@ -110,11 +110,13 @@ export default ({
         orbitalElements,
         currentSOI,
         targetSOI: radiusSOI(scenario.masses[1], target),
-        velocity: getVelocityMagnitude({
-          x: spacecraftMass.vx,
-          y: spacecraftMass.vy,
-          z: spacecraftMass.vz
-        }).toFixed(5)
+        velocity: parseFloat(
+          getVelocityMagnitude({
+            x: spacecraftMass.vx,
+            y: spacecraftMass.vy,
+            z: spacecraftMass.vz
+          }).toFixed(5)
+        )
       });
 
       modifyScenarioProperty({
diff --git a/src/data/scenarios/boris.json b/src/data/scenarios/boris.json
index a34861d92..a37ca8971 100644
--- a/src/data/scenarios/boris.json
+++ b/src/data/scenarios/boris.json
@@ -8,7 +8,7 @@
   "type": "Solar System",
   "particlesFun": false,
   "g": 39.5,
-  "dt": 0.001, 
+  "dt": 0.001,
   "distMax": 50,
   "distMin": -50,
   "rotatingReferenceFrame": "Sun",
diff --git a/src/data/scenarios/jovanSystem.json b/src/data/scenarios/jovanSystem.json
index 631398921..206f18986 100644
--- a/src/data/scenarios/jovanSystem.json
+++ b/src/data/scenarios/jovanSystem.json
@@ -4,7 +4,7 @@
   "sortOrder": 4,
   "description": "Gravity simulation of Jupiter and its Galilean moons - the four largest moons of Jupiter — Io, Europa, Ganymede, and Callisto - and the Juno spacecraft.",
   "type": "Solar System",
-  "particlesFun": false, 
+  "particlesFun": false,
   "g": 39.5,
   "dt": 0.000006,
   "soi": "Earth",
diff --git a/src/data/scenarios/martianSystem.json b/src/data/scenarios/martianSystem.json
index 41f1f7417..461729667 100644
--- a/src/data/scenarios/martianSystem.json
+++ b/src/data/scenarios/martianSystem.json
@@ -4,7 +4,7 @@
   "sortOrder": 12,
   "description": "Gravity simulation of Mars and its two Moons Phobos and Deimos. They are irregular in shape and much smaller than Earth's Moon",
   "particlesFun": false,
-  "type": "Solar System", 
+  "type": "Solar System",
   "g": 39.5,
   "dt": 9e-7,
   "distMax": 50,
diff --git a/src/data/scenarios/oumuamua.json b/src/data/scenarios/oumuamua.json
index ee2584edc..1353fa69f 100644
--- a/src/data/scenarios/oumuamua.json
+++ b/src/data/scenarios/oumuamua.json
@@ -6,7 +6,7 @@
   "type": "Solar System",
   "particlesFun": false,
   "g": 39.5,
-  "dt": 0.001, 
+  "dt": 0.001,
   "distMax": 50,
   "distMin": -50,
   "rotatingReferenceFrame": "Sun",
diff --git a/src/physics/integrators/Euler.ts b/src/physics/integrators/Euler.ts
index 6a88d80a5..b791bf07a 100644
--- a/src/physics/integrators/Euler.ts
+++ b/src/physics/integrators/Euler.ts
@@ -3,14 +3,14 @@ import H3 from "../vectors";
 export default class {
   g: number;
   dt: number;
-  tol: number;
-  maxDt: number;
-  minDt: number;
+  tol?: number;
+  maxDt?: number;
+  minDt?: number;
   masses: any[];
   elapsedTime: number;
   softening: number;
   softeningSquared: number;
-  useBarnesHut: boolean;
+  useBarnesHut?: boolean;
   theta: number;
   maximumDistance: number;
 
@@ -18,9 +18,20 @@ export default class {
   v: H3;
   p: H3;
 
-  constructor({ g, dt, masses, elapsedTime }: IntegratorType) {
+  constructor({
+    g,
+    dt,
+    masses,
+    elapsedTime,
+    tol,
+    maxDt,
+    minDt
+  }: IntegratorType) {
     this.g = g;
     this.dt = dt;
+    this.tol = tol;
+    this.maxDt = maxDt;
+    this.minDt = minDt;
     this.masses = masses;
     this.softening = 0;
     this.softeningSquared = this.softening * this.softening;
diff --git a/src/physics/integrators/KahanLi8.ts b/src/physics/integrators/KahanLi8.ts
index 5bc97fea0..5e4e1bf66 100644
--- a/src/physics/integrators/KahanLi8.ts
+++ b/src/physics/integrators/KahanLi8.ts
@@ -1,7 +1,7 @@
 import Euler from "./Euler";
 
 export default class extends Euler {
-  generatePositionVectors(v: Vector[], dt: number, p?: Vector[]): Vector[] {
+  generatePositionVectors(v: Vector[], dt: number, p: Vector[]): Vector[] {
     const pFinal = [];
     const vLen = v.length;
 
@@ -18,7 +18,7 @@ export default class extends Euler {
     return pFinal;
   }
 
-  generateVelocityVectors(a: Vector[], dt: number, v?: Vector[]): Vector[] {
+  generateVelocityVectors(a: Vector[], dt: number, v: Vector[]): Vector[] {
     const vFinal = [];
     const vLen = v.length;
 
diff --git a/src/physics/integrators/OrbitalElementsIntegrator.ts b/src/physics/integrators/OrbitalElementsIntegrator.ts
index 4781548a1..29c3280c4 100644
--- a/src/physics/integrators/OrbitalElementsIntegrator.ts
+++ b/src/physics/integrators/OrbitalElementsIntegrator.ts
@@ -21,7 +21,6 @@ export default class extends Euler {
       "name",
       tree.name
     );
-    const bodyPos = { x: body.x, y: body.y, z: body.z };
     const relPos = {
       x: body.x - parent.x,
       y: body.y - parent.y,
diff --git a/src/physics/integrators/PEFRL.ts b/src/physics/integrators/PEFRL.ts
index d843a13af..1f71b93a6 100644
--- a/src/physics/integrators/PEFRL.ts
+++ b/src/physics/integrators/PEFRL.ts
@@ -13,7 +13,7 @@ export default class extends Euler {
     this.chi = -0.6626458266981849e-1;
   }
 
-  generatePositionVectors(v: Vector[], dt: number, p?: Vector[]): Vector[] {
+  generatePositionVectors(v: Vector[], dt: number, p: Vector[]): Vector[] {
     super.generatePositionVectors(v, dt);
 
     const pFinal = [];
@@ -32,7 +32,7 @@ export default class extends Euler {
     return pFinal;
   }
 
-  generateVelocityVectors(a: Vector[], dt: number, v?: Vector[]): Vector[] {
+  generateVelocityVectors(a: Vector[], dt: number, v: Vector[]): Vector[] {
     super.generateVelocityVectors(a, dt);
 
     const vFinal = [];
diff --git a/src/physics/integrators/Sofspa10.ts b/src/physics/integrators/Sofspa10.ts
index 7a5ccc4db..66927d2dc 100644
--- a/src/physics/integrators/Sofspa10.ts
+++ b/src/physics/integrators/Sofspa10.ts
@@ -1,7 +1,7 @@
 import Euler from "./Euler";
 
 export default class extends Euler {
-  generatePositionVectors(v: Vector[], dt: number, p?: Vector[]): Vector[] {
+  generatePositionVectors(v: Vector[], dt: number, p: Vector[]): Vector[] {
     const pFinal = [];
     const vLen = v.length;
 
@@ -18,7 +18,7 @@ export default class extends Euler {
     return pFinal;
   }
 
-  generateVelocityVectors(a: Vector[], dt: number, v?: Vector[]): Vector[] {
+  generateVelocityVectors(a: Vector[], dt: number, v: Vector[]): Vector[] {
     const vFinal = [];
     const vLen = v.length;
 
diff --git a/src/physics/integrators/Yoshida6.ts b/src/physics/integrators/Yoshida6.ts
index 797679141..23f22a699 100644
--- a/src/physics/integrators/Yoshida6.ts
+++ b/src/physics/integrators/Yoshida6.ts
@@ -1,7 +1,7 @@
 import Euler from "./Euler";
 
 export default class extends Euler {
-  generatePositionVectors(v: Vector[], dt: number, p?: Vector[]): Vector[] {
+  generatePositionVectors(v: Vector[], dt: number, p: Vector[]): Vector[] {
     const pFinal = [];
     const vLen = v.length;
 
@@ -18,7 +18,7 @@ export default class extends Euler {
     return pFinal;
   }
 
-  generateVelocityVectors(a: Vector[], dt: number, v?: Vector[]): Vector[] {
+  generateVelocityVectors(a: Vector[], dt: number, v: Vector[]): Vector[] {
     const vFinal = [];
     const vLen = v.length;
 
diff --git a/src/physics/spacecraft/SpacecraftService.ts b/src/physics/spacecraft/SpacecraftService.ts
index 9cd3ede3c..2ff4534f6 100644
--- a/src/physics/spacecraft/SpacecraftService.ts
+++ b/src/physics/spacecraft/SpacecraftService.ts
@@ -30,9 +30,4 @@ export default class {
     spacecraft.vy += deltaV * Math.sign(spacecraft.vy) * directionalSlope.y;
     spacecraft.vz += deltaV * Math.sign(spacecraft.vx) * directionalSlope.z;
   }
-
-  static applyOrbitalInsertionBurn(
-    spacecraft: MassType,
-    deltaV: number
-  ): void {}
 }
diff --git a/src/physics/spacecraft/lambert.ts b/src/physics/spacecraft/lambert.ts
index 3fd1c090c..35a73004c 100644
--- a/src/physics/spacecraft/lambert.ts
+++ b/src/physics/spacecraft/lambert.ts
@@ -118,7 +118,6 @@ function tofEqP2(
 function tofEqP3(
   x: number,
   y: number,
-  trash: number,
   dT: number,
   ddT: number,
   ll: number
@@ -148,7 +147,7 @@ function halley(
     if (fder2 == 0) {
       console.log("fder2 was 0");
     }
-    fder3 = tofEqP3(p0, y, T0, fder, fder2, ll);
+    fder3 = tofEqP3(p0, y, fder, fder2, ll);
     p = p0 - (2 * fder * fder2) / (2 * fder2 ** 2 - fder * fder3);
     if (Math.abs(p - p0) < tol) {
       return p;
@@ -179,7 +178,7 @@ function householder(
     T = fval + T0;
     fder = tofEqP(p0, y, T, ll);
     fder2 = tofEqP2(p0, y, T, fder, ll);
-    fder3 = tofEqP3(p0, y, T, fder, fder2, ll);
+    fder3 = tofEqP3(p0, y, fder, fder2, ll);
     p =
       p0 -
       fval *
@@ -428,6 +427,8 @@ export function stateToKepler(
   };
 }
 
+/*
+
 export function stateToKepler2(
   r: { x: number; y: number; z: number },
   v: { x: number; y: number; z: number },
@@ -468,6 +469,8 @@ export function stateToKepler2(
   };
 }
 
+*/
+
 export function keplerToState(
   orb: OrbitalElements,
   gm: number
@@ -478,7 +481,6 @@ export function keplerToState(
   const i = orb.i;
   const argP = orb.argP;
   const lAn = orb.lAn;
-  const trueAnom = orb.trueAnom;
   const eccAnom = orb.eccAnom;
 
   let o = { x: 0, y: 0, z: 0 };
diff --git a/src/scene/Camera.ts b/src/scene/Camera.ts
index e3abbc8de..95ce52f71 100755
--- a/src/scene/Camera.ts
+++ b/src/scene/Camera.ts
@@ -8,9 +8,9 @@ import StellarService from "../physics/stars";
 const TWEEN = require("@tweenjs/tween.js");
 
 export default class extends PerspectiveCamera {
-  controls: ReturnType<typeof CustomizedOrbitControls>;
+  controls: any;
   rotatingReferenceFrame: H3;
-  rotatedMasses: Vector[];
+  rotatedMasses: MassType[];
   rotatedBarycenter: Vector;
   started: boolean;
 
@@ -118,7 +118,6 @@ export default class extends PerspectiveCamera {
     cameraFocus: string,
     previous: { cameraFocus: string },
     barycenterZ: number,
-    customCameraToBodyDistanceFactor: number,
     masses: MassType[],
     manifestations: Manifestation[],
     cameraPosition: string
@@ -199,29 +198,30 @@ export default class extends PerspectiveCamera {
           ({ massType }) => massType === "star"
         );
 
-        const [
-          habitableZoneStart,
-          habitableZoneEnd
-        ] = StellarService.getHabitableZoneBounds(star.m);
-
-        this.tween(
-          {
-            x: star.x,
-            y: star.y + star.radius * 3,
-            z: star.z
-          },
-          {
-            x: star.x,
-            y: star.y + star.radius * 3,
-            z: habitableZoneEnd * star.scale * 5
-          },
-          {
-            x: star.x,
-            y: star.y,
-            z: star.z
-          },
-          5000
-        );
+        if (star) {
+          const habitableZoneEnd = StellarService.getHabitableZoneBounds(
+            star.m
+          )[1];
+
+          this.tween(
+            {
+              x: star.x,
+              y: star.y + star.radius * 3,
+              z: star.z
+            },
+            {
+              x: star.x,
+              y: star.y + star.radius * 3,
+              z: habitableZoneEnd * star.scale * 5
+            },
+            {
+              x: star.x,
+              y: star.y,
+              z: star.z
+            },
+            5000
+          );
+        }
       }
 
       return;
@@ -266,7 +266,7 @@ export default class extends PerspectiveCamera {
   }
 
   tween(from: Vector, to: Vector, lookAt: Vector, duration: number) {
-    const tween = new TWEEN.Tween(from)
+    new TWEEN.Tween(from)
       .to(to, duration)
       .easing(TWEEN.Easing.Exponential.InOut)
       .onUpdate(() => {
diff --git a/src/scene/Graphics2D.ts b/src/scene/Graphics2D.ts
index 9671d16d8..b6bdb2944 100644
--- a/src/scene/Graphics2D.ts
+++ b/src/scene/Graphics2D.ts
@@ -6,7 +6,7 @@ export default class {
 
   constructor(canvas: HTMLCanvasElement) {
     this.canvas = canvas;
-    this.ctx = this.canvas.getContext("2d");
+    this.ctx = <CanvasRenderingContext2D>this.canvas.getContext("2d");
   }
 
   clear(): void {
diff --git a/src/scene/ManifestationsService.ts b/src/scene/ManifestationsService.ts
index eb87bded8..74e0ccc61 100644
--- a/src/scene/ManifestationsService.ts
+++ b/src/scene/ManifestationsService.ts
@@ -90,7 +90,14 @@ export default class {
   dispose() {
     this.manifestations.forEach(manifestation => {
       manifestation.dispose();
-      this.scene.remove(this.scene.getObjectByName(manifestation.name));
+
+      const manifestationInstance = this.scene.getObjectByName(
+        manifestation.name
+      );
+
+      if (manifestationInstance) {
+        this.scene.remove(manifestationInstance);
+      }
     });
   }
 }
diff --git a/src/scene/Spacecraft.ts b/src/scene/Spacecraft.ts
index 7e6a4afc9..b1daf6c09 100644
--- a/src/scene/Spacecraft.ts
+++ b/src/scene/Spacecraft.ts
@@ -16,7 +16,7 @@ export default class extends MassManifestation {
 
   draw(
     position: MassType,
-    spacecraftDirections: {
+    spacecraftDirections?: {
       x: number;
       y: number;
       z: number;
@@ -25,20 +25,22 @@ export default class extends MassManifestation {
   ) {
     const main = this.getObjectByName("main");
 
-    const flame = main.getObjectByName("flame");
+    if (main) {
+      const flame = main.getObjectByName("flame");
 
-    if (thrustOn && flame) {
-      flame.visible = true;
-    } else if (flame) {
-      flame.visible = false;
-    }
+      if (thrustOn && flame) {
+        flame.visible = true;
+      } else if (flame) {
+        flame.visible = false;
+      }
 
-    main.position.set(position.x, position.y, position.z);
+      main.position.set(position.x, position.y, position.z);
 
-    if (spacecraftDirections) {
-      main.rotation.x = spacecraftDirections.z;
-      main.rotation.y = spacecraftDirections.y;
-      main.rotation.z = spacecraftDirections.x;
+      if (spacecraftDirections) {
+        main.rotation.x = spacecraftDirections.z;
+        main.rotation.y = spacecraftDirections.y;
+        main.rotation.z = spacecraftDirections.x;
+      }
     }
   }
 
diff --git a/src/scene/drawManifestation.ts b/src/scene/drawManifestation.ts
index bb0b37306..9bc43026a 100644
--- a/src/scene/drawManifestation.ts
+++ b/src/scene/drawManifestation.ts
@@ -3,7 +3,7 @@ import { Manifestation } from "./ManifestationsService";
 export default function(
   this: any,
   manifestation: Manifestation,
-  rotatedPosition: Vector,
+  rotatedPosition: MassType,
   delta: number,
   mass: MassType
 ) {
diff --git a/src/scene/index.js b/src/scene/index.js
index 21de08542..f783042b1 100755
--- a/src/scene/index.js
+++ b/src/scene/index.js
@@ -384,7 +384,6 @@ const scene = {
       this.scenario.cameraFocus,
       this.previous,
       this.scenario.barycenterZ,
-      this.scenario.customCameraToBodyDistanceFactor,
       this.scenario.masses,
       this.manifestationsService.manifestations,
       this.scenario.cameraPosition
diff --git a/src/state/creators/scenario.ts b/src/state/creators/scenario.ts
index d66a07c85..640d66b33 100755
--- a/src/state/creators/scenario.ts
+++ b/src/state/creators/scenario.ts
@@ -35,7 +35,7 @@ export const modifyScenarioProperty = (
 export const resetScenario = () =>
   modifyScenarioProperty(
     ...Object.entries(
-      JSON.parse(sessionStorage.getItem("currentScenario"))
+      JSON.parse(sessionStorage.getItem("currentScenario") || "{}")
     ).map(([key, value]: [string, any]) => ({
       key,
       value
@@ -165,7 +165,13 @@ export const getTrajectory = (
       resolve => {
         trajectoryCruncher.addEventListener(
           "message",
-          ({ data: { trajectory } }) => {
+          ({
+            data: { trajectory }
+          }: {
+            data: {
+              trajectory: [Vector, { x: number; y: number; z: number; p: any }];
+            };
+          }) => {
             resolve(trajectory);
           }
         );
diff --git a/src/state/reducers/scenario.ts b/src/state/reducers/scenario.ts
index e21a417e2..8edc1fab5 100755
--- a/src/state/reducers/scenario.ts
+++ b/src/state/reducers/scenario.ts
@@ -35,7 +35,7 @@ export default (state = <ScenarioState>{}, action: ScenarioActionTypes) => {
         .indexOf(action.name);
 
       const newMasses = state.masses.filter(
-        (mass: MassType, i: number) => index !== i
+        (_mass: MassType, i: number) => index !== i
       );
 
       let newState;
diff --git a/src/templates/StarshipScenario.tsx b/src/templates/StarshipScenario.tsx
index 3ac7b44ef..112235a86 100644
--- a/src/templates/StarshipScenario.tsx
+++ b/src/templates/StarshipScenario.tsx
@@ -17,12 +17,13 @@ interface ScenarioProps {
   setScenario: typeof scenarioActionCreators.setScenario;
   getTrajectory: typeof scenarioActionCreators.getTrajectory;
   modifyScenarioProperty: typeof scenarioActionCreators.modifyScenarioProperty;
-  resetScenario: typeof scenarioActionCreators.resetScenario;
+  location: {
+    pathname: string;
+  };
 }
 
 const Scenario = ({
   setScenario,
-  resetScenario,
   modifyScenarioProperty,
   getTrajectory,
   data,
@@ -46,7 +47,6 @@ const Scenario = ({
         bodyCssClass="body-with-overflow-hidden"
       />
       <StarshipSimulator
-        resetScenario={resetScenario}
         modifyScenarioProperty={modifyScenarioProperty}
         getTrajectory={getTrajectory}
         scenario={scenario}
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 413839141..5ea876297 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -5,12 +5,6 @@ interface Vector {
 }
 
 interface MassType extends Vector {
-  name?: string;
-  color?: string;
-  m: number;
-  vx: number;
-  vy: number;
-  vz: number;
   [key: string]: any;
 }
 
@@ -64,10 +58,10 @@ interface SOITree {
   name: string;
   SOIradius: number;
   children: SOITree[];
-  m: number;
-  x: number;
-  y: number;
-  z: number;
+  m?: number;
+  x?: number;
+  y?: number;
+  z?: number;
 }
 
 interface ScenarioSeed {
@@ -90,6 +84,7 @@ interface ExoplanetScenarioSeed {
 
 interface ScenarioState {
   name: string;
+  fileName?: string;
   description: string;
   type: string;
   exoPlanetArchive?: boolean;
@@ -106,12 +101,14 @@ interface ScenarioState {
   maxDt: number;
   g: number;
   softeningConstant: number;
-  useBarnesHut?: boolean;
+  useBarnesHut: boolean;
   theta: number;
   elapsedTime: number;
   barycenter: boolean;
   systemBarycenter: boolean;
   barycenterMassOne: string;
+  minTOF: number;
+  maxTOF: number;
   barycenterMassTwo: string;
   collisions: boolean;
   particles: {
@@ -133,7 +130,10 @@ interface ScenarioState {
   velMin: number;
   velMax: number;
   velStep: number;
+  thrustOn: boolean;
+  spacecraftDirections: Vector;
   masses: MassType[];
+  mapMode: boolean;
   massBeingModified: string;
   trails: boolean;
   labels: boolean;
@@ -163,7 +163,6 @@ interface ScenarioState {
   };
   soi?: string;
   scenarioDescription?: string;
-  scenarioWikiUrl?: string;
 }
 
 interface Shape {
diff --git a/src/utils.ts b/src/utils.ts
index 6466a73e7..98cb016e8 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -46,7 +46,7 @@ export const getTextureFromCanvas = (
   ) => void
 ): HTMLCanvasElement => {
   const canvas = document.createElement("canvas");
-  const ctx = canvas.getContext("2d");
+  const ctx = canvas.getContext("2d") as CanvasRenderingContext2D;
   const width = window.innerWidth;
   const height = window.innerHeight;
 
diff --git a/tsconfig.json b/tsconfig.json
index bd270e22f..ff6742d50 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -61,6 +61,7 @@
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
 
     /* Advanced Options */
-    "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
+    "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */,
+    "skipLibCheck": true
   }
 }