diff --git a/style.css b/fr-calendar.css
similarity index 100%
rename from style.css
rename to fr-calendar.css
diff --git a/main.js b/main.js
index 54dba9a..dc1e2c0 100644
--- a/main.js
+++ b/main.js
@@ -134,12 +134,12 @@ function scanFile(editor, data)
 		res = [...line.matchAll("\\[(" + DateFormat.date + "(?:-" + DateFormat.date + ")?)\\]")];
 		if (res.length > 0)
 		{
-			if ((res[0] == "[-]" && res.length > 1) || res[0] != "[-]")
+			if (res[0][0] == "[-]" && res.length > 1)
+			{
+				res[0] = res[1];
+			}
+			if (res[0][0] != "[-]")
 			{
-				if (res[0][0] == "[-]")
-				{
-					res[0] = res[1];
-				}
 				res = res[0]
 				res[1] = parseDate(res[1], defal);
 				let procesed = processLine(line, line.replace(res[0], ''), res[1], data);
@@ -432,7 +432,7 @@ class CalendarView extends ItemView
 			{
 				let day = date[0].day() - 1
 				day = (day == -1) ? 6 : day;
-				if (event.date.match(DateFormat.time) == '12:00am')
+				if (event.date.match(DateFormat.time)[0] == '12:00am')
 				{
 					this.renderEvent(event, this.allday[day]);
 				}
@@ -446,7 +446,7 @@ class CalendarView extends ItemView
 
 	renderEvent(event, container)
 	{
-		el = container.createEl('div', {
+		let el = container.createEl('div', {
 			cls: 'frcal__event',
 			id: "fr_event_" + event.id,
 			attr: {
@@ -516,7 +516,7 @@ class FRCalander extends Plugin
 			app.workspace.setActiveLeaf(leaf);
 		});
 
-		this.data = this.loadData();
+		this.data = await this.loadData();
 	}
 }