diff --git a/src/Simulation/visualizations/GIFGenerator.jsx b/src/Simulation/visualizations/GIFGenerator.jsx
index 128b39e..5843708 100644
--- a/src/Simulation/visualizations/GIFGenerator.jsx
+++ b/src/Simulation/visualizations/GIFGenerator.jsx
@@ -21,57 +21,61 @@ class GIFGenerator extends React.Component {
       return;
     }
     this.setState({rendering: true});
-    this.setState({duration: Math.abs(this.state.duration)});
-    var gif = new GIF( {
-      workers: 2,
-      quality: 10,
-      repeat: this.state.loop? 0 : -1,
-      background: this.state.background
-    });
+    this.setState({duration: Number(Math.abs(this.state.duration))},
+      () => {
+        var gif = new GIF( {
+          workers: 2,
+          quality: 10,
+          repeat: this.state.loop? 0 : -1,
+          background: this.state.background
+        });
 
-    //set download trigger
-    gif.on('finished', function(blob) {
-      this.setState({rendering: false});
-      const link = document.createElement('a');
-      // create a blobURI pointing to our Blob
-      link.href = URL.createObjectURL(blob);
-      link.download = "simulationGIF";
-      // some browser needs the anchor to be in the doc
-      document.body.append(link);
-      link.click();
-      link.remove();
-      // in case the Blob uses a lot of memory
-      setTimeout(() => URL.revokeObjectURL(link.href), 7000);
-    }.bind(this));
+        //set download trigger
+        gif.on('finished', function(blob) {
+          this.setState({rendering: false});
+          const link = document.createElement('a');
+          // create a blobURI pointing to our Blob
+          link.href = URL.createObjectURL(blob);
+          link.download = "simulationGIF";
+          // some browser needs the anchor to be in the doc
+          document.body.append(link);
+          link.click();
+          link.remove();
+          // in case the Blob uses a lot of memory
+          setTimeout(() => URL.revokeObjectURL(link.href), 7000);
+        }.bind(this));
 
-    let stepBefore = this.state.step;
+        let stepBefore = this.state.step;
 
-    //clear playing animation
-    clearInterval(this.animationId);
+        //clear playing animation
+        clearInterval(this.animationId);
 
-    this.props.setState({step: 0}, () => {
-      this.stepTime = 1;
-      //this.animationId = setInterval(this.visualizeOneStep, this.stepTime);
-      this.animationId = setInterval(this.grabImageAndNextStep.bind(null, gif, stepBefore), this.stepTime);
-      this.props.setState({playing: true});
-    });
+        this.props.setState({step: 0}, () => {
+          this.animationId = setInterval(this.grabImageAndNextStep.bind(null, gif, stepBefore,this.state.duration * 1000 / this.props.animationLength), 1);
+          this.props.setState({playing: true});
+        });
+      });
   }
 
-  grabImageAndNextStep = (gif, stepBefore) => {
+  grabImageAndNextStep = (gif, stepBefore, delay) => {
     //check if we are at the end
-    if (this.props.state.step > this.props.animationLength) {
+    if (this.props.state.step >= this.props.animationLength) {
+      //add last frame and finish
+      this.props.visualizeOneStep();
+      clearInterval(this.animationId);
+      gif.addFrame(document.querySelectorAll("canvas")[2],
+        {copy: true, delay: delay});
+      //reset animation
+      this.props.setState({playing: false});
       this.props.setState({step: stepBefore});
       this.props.visualizeOneStep(false);
-      clearInterval(this.animationId);
       gif.render();
-      this.props.setState({playing: false});
       return;
     }
     this.props.visualizeOneStep();
     //select the canvas (this is a bit hacky but ey it works)
     gif.addFrame(document.querySelectorAll("canvas")[2],
-      // there is probably a minimum cap.... I'm not sure
-      {copy: true, delay: this.state.duration / this.props.animationLength});
+      {copy: true, delay: delay});
   }
 
   getButtonText = () => {
@@ -81,34 +85,34 @@ class GIFGenerator extends React.Component {
     return "Generate GIF 📸";
   }
 
-    //onChange={(e) => this.setState({loop: e.state.value})}>
+  //onChange={(e) => this.setState({loop: e.state.value})}>
   render() {
     return (
-    <div id="generateGIFPopup">
-      <div className="popupHeader">
-        GIF Generator
-      </div>
-      <div className="popupSection">
-        <label htmlFor="gifDuration" id="gifLengthLabel">Duration In Seconds: </label>
-        <input htmlFor="gifDuration" type="number" id="gifLengthInput"
-        value={this.state.duration} onChange={(e) => this.setState({duration: e.target.value})}/>
-      </div>
+      <div id="generateGIFPopup">
+        <div className="popupHeader">
+          GIF Generator
+        </div>
+        <div className="popupSection">
+          <label htmlFor="gifDuration" id="gifLengthLabel">Duration In Seconds: </label>
+          <input htmlFor="gifDuration" type="number" id="gifLengthInput"
+          value={this.state.duration} onChange={(e) => this.setState({duration: e.target.value})}/>
+        </div>
 
-      <div className="popupSection">
-        <label htmlFor="gifBackground" id="gifBackgroundLabel">Background Color: </label>
-        <input htmlFor="gifBackground" id="gifBackgroundInput" type='color'
-        value={this.state.background}
-        onChange={(e) => this.setState({background: e.target.value})}/>
+        <div className="popupSection">
+          <label htmlFor="gifBackground" id="gifBackgroundLabel">Background Color: </label>
+          <input htmlFor="gifBackground" id="gifBackgroundInput" type='color'
+          value={this.state.background}
+          onChange={(e) => this.setState({background: e.target.value})}/>
+        </div>
+        <div className="popupSection">
+          <label htmlFor="gifLoop" id="gifLoopLabel">Loop: </label>
+          <input htmlFor="gifLoop" id="gifLoopInput" type="checkbox" checked={this.state.loop}
+          onChange={(e) => 
+          this.setState({loop: e.target.checked})}/>
+        </div>
+        <button className="popupButton" onClick={this.generateGIF} >{this.getButtonText()}</button>
       </div>
-      <div className="popupSection">
-        <label htmlFor="gifLoop" id="gifLoopLabel">Loop: </label>
-        <input htmlFor="gifLoop" id="gifLoopInput" type="checkbox" checked={this.state.loop}
-        onChange={(e) => 
-        this.setState({loop: e.target.checked})}/>
-      </div>
-      <button className="popupButton" onClick={this.generateGIF} >{this.getButtonText()}</button>
-    </div>
-    );
+      );
   }
 }
 
diff --git a/src/Simulation/visualizations/Graph.jsx b/src/Simulation/visualizations/Graph.jsx
index c55e38f..e2f2f54 100644
--- a/src/Simulation/visualizations/Graph.jsx
+++ b/src/Simulation/visualizations/Graph.jsx
@@ -124,7 +124,6 @@ class Graph extends React.Component {
       this.setState({playing: true});
       return;
     }
-    console.log("here")
     this.neverPlayed = false;
     //check if we pause the animation
     clearInterval(this.animationId);