diff --git a/node-entry.js b/node-entry.js
index fe58d25..88de05e 100644
--- a/node-entry.js
+++ b/node-entry.js
@@ -79,14 +79,19 @@ low(new FileAsync(__dirname + '/db.json')) // production
 				'Access-Control-Allow-Origin': '*'
 			});
 			const videos = db.get('videos');
-			if (req.query.prevId){ 
-				let tmp=videos.map(el=>el.id.reason.map(el=>el.reason.map(el2=>{
-					if(el2.prevId===req.query.prevId){
-						return {...el2, 'id':this.id}
-					}
-				},el)));
-			res.send(tmp)} 
-			else{res.send(videos)}
+			if (req.query.prevId) {
+				let tmp = videos.map(el => el.id.reason.map(el =>
+					el.reason.map(el2 => {
+						if (el2.prevId === req.query.prevId) {
+							return ({ ...el2, 'id': this.id })
+						}
+						return {}
+					}, el)));
+				res.send(tmp)
+			}
+			else { 
+				res.send(videos) 
+			}
 		});
 
 		// POST /videotrack
diff --git a/src/VideoPlayer.js b/src/VideoPlayer.js
index 9a91693..40eeef5 100644
--- a/src/VideoPlayer.js
+++ b/src/VideoPlayer.js
@@ -65,7 +65,7 @@ class VideoPlayer extends React.Component {
 							default:
 								break;
 						}
-					}, 1500);
+					}, 500);
 					this.setState({ outsideReject2: reject });
 				})
 			});
@@ -78,7 +78,7 @@ class VideoPlayer extends React.Component {
 								timerId1 = window.setInterval(() => {
 									if (event.target.getCurrentTime() > 15)
 										resolve(event.target.getVideoData().video_id);
-								}, 1200);
+								}, 500);
 								this.setState({ outsideReject1: reject });
 							})
 						});
@@ -141,21 +141,24 @@ class VideoPlayer extends React.Component {
 									localStorage.setItem('lastWatched', JSON.stringify(tmp));
 									//.finally(()=>{})
 									clearInterval(timerId1);
+									return new Promise ((resolve,reject) => resolve(videoIdWatched))
 								},
 								error => console.error(error)
 							)
-
-							.finally(() => this.setState({ promise1: null, outsideReject1: null }));
-						break;
+							.finally((id) => this.setState({ promise1: null, outsideReject1: null }));
+							break;
 					case 5:
 						if (this.state.promise1)
 							this.state.outsideReject1('Video changed');
+
 						break;
 					default:
 						break;
 				}
+
+			return new Promise ((resolve,reject) => resolve('ok'))
 			})
-				.finally(() => { this.setState({ promise2: null, outsideReject2: null }) });
+				.finally((res) => { this.setState({ promise2: null, outsideReject2: null }) });
 		}
 	}
 	_onStateChange = this._onStateChange.bind(this);
diff --git a/src/Wikipedia.js b/src/Wikipedia.js
index 4322013..ff08663 100644
--- a/src/Wikipedia.js
+++ b/src/Wikipedia.js
@@ -261,12 +261,11 @@ class Wikipedia extends Component {
 				return new Promise((resolve, reject) => {
 					timerId1 = window.setInterval(() => {
 						if (this.state.wikidataQ == undefined || this.state.wikidata == undefined) { }
-						else {
-							resolve({
+						else 
+													resolve({
 								artist: this.state.wikidataQ[this.state.wikidata.claims["P175"][0].mainsnak.datavalue.value.id].labels.en.value.toString(),
 								genre: this.state.wikidataQ[this.state.wikidata.claims["P136"][0].mainsnak.datavalue.value.id].labels.en.value.toString()
 							})
-						}
 					}, 1000)
 				})
 			}).then((res) => {