diff --git a/node-entry.js b/node-entry.js
index afc04f9..c6e9d21 100644
--- a/node-entry.js
+++ b/node-entry.js
@@ -97,5 +97,8 @@ low(new FileAsync(__dirname + '/db.json')) // production
 	})
 	.then(() => {
 		app.use(express.static(__dirname + '/build')); // serve static build site
+		app.get('*', (req,res) =>{
+			res.sendFile(__dirname+'/build/index.html');
+		});
 		app.listen(8000, () => console.log('listen on 8000')); // bind to port 8000 as required from specs
 	});
diff --git a/src/Wikipedia.js b/src/Wikipedia.js
index 6a91828..ba61a56 100644
--- a/src/Wikipedia.js
+++ b/src/Wikipedia.js
@@ -193,8 +193,7 @@ class Wikipedia extends Component {
 				}
 				return new Promise ((resolve,reject) => {
 					timerId1 = window.setInterval(()=>{
-						if(this.state.wikipedia
-							&& this.state.wikidataQ && this.state.wikidata)
+						if((this.state.wikipedia !== 'undefined') && (this.state.wikidataQ !== 'undefined') && (this.state.wikidata !== 'undefined'))
 							resolve({
 								artist: this.state.wikipedia.info.artist.toString(),
 					genre: this.state.wikidataQ[this.state.wikidata.claims["P136"][0].mainsnak.datavalue.value.id].labels.en.value.toString()
diff --git a/src/reccomenders/similarityArtist.js b/src/reccomenders/similarityArtist.js
index 82b5d4b..abc6ec0 100644
--- a/src/reccomenders/similarityArtist.js
+++ b/src/reccomenders/similarityArtist.js
@@ -2,7 +2,6 @@ import React from 'react';
 import axios from 'axios';
 import { Link } from 'react-router-dom';
 import { Col, Media } from 'react-bootstrap';
-import { reject } from 'q';
 
 class similarityArtist extends React.Component {