diff --git a/public/index.html b/public/index.html
index fe7f3fc17ed55c12813c03798599b0818c9c60ff..15bc47680ed64f42ec5fb68f476b7ef293ce6a2f 100644
--- a/public/index.html
+++ b/public/index.html
@@ -11,6 +11,20 @@
     />
     <script>
       var EMULATOR_CONSOLE_READ = () => { return window.prompt()};
+
+      // Fixes for printing with new lines.
+      let waccPrintingBuffer = ""
+      function waccPrint(str) {
+          printing_buffer += str
+      }
+
+      function waccPrintLn(str) {
+          waccPrint(str + "\n")
+      }
+
+      function waccPrintFinished() {
+          console.log(waccPrintingBuffer)
+      }
     </script>
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
     <!--
diff --git a/src/App.js b/src/App.js
index bd8e531a6b5373913b336bafa8a4d0ff6cdd9a3b..410f40e2c5a25e5a8ad761dba5bc3ae4c888a410 100644
--- a/src/App.js
+++ b/src/App.js
@@ -60,7 +60,10 @@ class App extends React.Component {
     clearConsole = () => {
         this.setState({consoleReset: this.state.consoleReset + 1})
     }
+
     processWaccCode = async (code) => {
+        eval("waccPrintingBuffer = ''")
+
         let rsp = await sendWaccCode(code);
         let graph = this.state.graphData;
         if (typeof rsp.isError !== "undefined") {
@@ -73,8 +76,6 @@ class App extends React.Component {
                 graphData: graph
             })
         }
-
-
     }
 
     render() {
@@ -90,10 +91,11 @@ class App extends React.Component {
                                             this.processWaccCode(this.state.wacc.code)
                                             this.clearConsole()
                                         }}
-                                        onStepJsClick={(e) => {
-                                            this.setState({js: {code: "Hello World!"}})
+                                        onExecuteClick={(e) => {
+                                            eval(this.state.js.code)
+                                            eval("waccPrintFinished()")
                                         }}
-                                        onStepOverAstClick={(e) => {
+                                        onStepWaccClick={(e) => {
                                             this.readInputCallBack(e)
                                         }}
                                     />
diff --git a/src/Comm.js b/src/Comm.js
index 3b88cd01f6939aacb9cde5eb59bc42afbb7c3727..4e2f0de34f0424705e36df5dc122205819136b85 100644
--- a/src/Comm.js
+++ b/src/Comm.js
@@ -25,7 +25,7 @@ function generateArmMarkers(lineNums) {
 }
 
 function createGraphNode(node, astMeta){
-    let name = node.name;
+    let name = node.name.replace("AST", "");
     let value = node.value;
     let childrenIDs = node.children;
     let children = [];
diff --git a/src/index.js b/src/index.js
index 53a2beb68b15c4d064919a4b680d9f281833a45d..8862abaddf1f6d6c975a8715ffb9e81f2db6db76 100644
--- a/src/index.js
+++ b/src/index.js
@@ -3,7 +3,9 @@ import ReactDOM from 'react-dom';
 import './index.css';
 import App from './App';
 import * as serviceWorker from './serviceWorker';
+
 export var test = ""
+
 ReactDOM.render(<App />, document.getElementById('root'));
 
 // If you want your app to work offline and load faster, you can change