diff --git a/node.js b/node.js
index da24bd7..ae1ac3e 100644
--- a/node.js
+++ b/node.js
@@ -4,17 +4,18 @@ const util = require('util');
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
-const exec = util.promisify(require('child_process').exec);
-const readFileAsync = util.promisify(fs.readFile)
 
+const exec = util.promisify(require('child_process').exec);
+const readFileAsync = util.promisify(fs.readFile);
 
 const app = express(); // app is an instance of express
 
 app.use(compression()); // enables gzip compression
-app.options('/dvbStatus', (req, res) => {
+
+app.options('*', (req, res) => {
 	res.set({
 		'Access-Control-Allow-Origin': '*',
-		'Access-Control-Allow-Methods': ' GET, OPTIONS',
+		'Access-Control-Allow-Methods': 'GET, OPTIONS',
 		'Access-Control-Allow-Headers': 'Content-Type',
 		'Access-Control-Max-Age': 600
 	})
@@ -26,8 +27,7 @@ app.get('/dvbStatus', async (req, res) => {
 		'Access-Control-Allow-Origin': '*'
 	});
 	const { stdout, stderr } = await exec('DTV');
-	let i = parseInt(stdout);
-	i = i*1e-6; // i is in Hz; divide by 1M to have MHz
+	const i = parseInt(stdout) * 1e-6; // i is in Hz; divide by 1M to have MHz
 	res.send({
 		"id": "dvb-t-status",
 		"data": `Frontend Frequency: ${i} Mhz`,
@@ -36,30 +36,18 @@ app.get('/dvbStatus', async (req, res) => {
 
 });
 
-
-app.options('/dvbChannel', (req, res) => {
-	res.set({
-		'Access-Control-Allow-Origin': '*',
-		'Access-Control-Allow-Methods': ' GET, OPTIONS',
-		'Access-Control-Allow-Headers': 'Content-Type',
-		'Access-Control-Max-Age': 600
-	})
-	res.status(200).end();
-})
-
 app.get('/dvbChannel', async (req, res) => {
 	res.set({
 		'Access-Control-Allow-Origin': '*'
 	});
 	const { stdout, stderr } = await exec('DTV');
-	let i = parseInt(stdout);
-	i = i*1e-6; // i is in Hz; divide by 1M to have MHz
+	const i = parseInt(stdout) * 1e-6; // i is in Hz; divide by 1M to have MHz
 	readFileAsync(path.join(__dirname,"frequencies.json"))
 	.then(res2 => {
 		const db = JSON.parse(res2);
-		//console.log(db[i]);
 		res.send({
-			"id": `dvb-t-channel ${db[i]["name"]}`,
+			"id": `dvb-t-channel`,
+			"name": db[i]["name"].toString(),
 			"data": db[i]["channels"].toString(),
 			"stderr": stderr
 		});
@@ -69,15 +57,6 @@ app.get('/dvbChannel', async (req, res) => {
 
 });
 
-app.options('/internetCheck', async (req, res) => {
-	res.set({
-		'Access-Control-Allow-Origin': '*',
-		'Access-Control-Allow-Methods': ' GET, OPTIONS',
-		'Access-Control-Allow-Headers': 'Content-Type',
-		'Access-Control-Max-Age': 600
-	})
-	res.status(200).end();
-})
 app.get('/internetCheck', async (req, res) => {
 	res.set({
 		'Access-Control-Allow-Origin': '*'
@@ -93,16 +72,6 @@ app.get('/internetCheck', async (req, res) => {
 
 });
 
-app.options('/sysStatus', (req, res) => {
-	res.set({
-		'Access-Control-Allow-Origin': '*',
-		'Access-Control-Allow-Methods': ' GET, OPTIONS',
-		'Access-Control-Allow-Headers': 'Content-Type',
-		'Access-Control-Max-Age': 600
-	})
-	res.status(200).end();
-})
-
 app.get('/sysStatus', async (req, res) => {
 	res.set({
 		'Access-Control-Allow-Origin': '*'
@@ -113,7 +82,7 @@ app.get('/sysStatus', async (req, res) => {
 		res.send(
 			{
 				"id": "sys-stats",
-				"data": `Temp: ${parseFloat(res2)*1e-3.toFixed(2)} °C Load Avg: ${os.loadavg().map(x=>x.toFixed(2)).toString()}`,
+				"data": `Temp: ${(parseFloat(res2)*1e-3).toFixed(2)} °C Load Avg: ${os.loadavg().map(x=>x.toFixed(2)).toString()}`,
 				"stderr": ""
 			}
 		)