diff --git a/source/ChartingState.hx b/source/ChartingState.hx
index ad7654e..13af2f6 100644
--- a/source/ChartingState.hx
+++ b/source/ChartingState.hx
@@ -638,7 +638,7 @@ class ChartingState extends MusicBeatState
 			var eventPos = new FlxUIInputText(150,100,80,"");
 			var eventAdd = new FlxButton(95,155,"Add Event", function() {
 
-				var pog:Song.Event = new Song.Event("New Event " + HelperFunctions.truncateFloat(curDecimalBeat, 3),HelperFunctions.truncateFloat(curDecimalBeat, 3),_song.bpm + "","BPM Change");
+				var pog:Song.Event = new Song.Event("New Event " + HelperFunctions.truncateFloat(curDecimalBeat, 3),HelperFunctions.truncateFloat(curDecimalBeat, 3),_song.bpm,"BPM Change");
 				
 				trace("adding " + pog.name);
 
@@ -653,13 +653,13 @@ class ChartingState extends MusicBeatState
 
 				eventName.text = pog.name;
 				eventType.selectedLabel = pog.type;
-				eventValue.text = pog.value;
+				eventValue.text = pog.value + "";
 				eventPos.text = pog.position + "";
 				currentSelectedEventName = pog.name;
 				currentEventPosition = pog.position;
 
 				savedType = pog.type;
-				savedValue = pog.value;
+				savedValue = pog.value + "";
 
 				var listofnames = [];
 	
@@ -737,13 +737,13 @@ class ChartingState extends MusicBeatState
 
 				eventName.text = firstEvent.name;
 				eventType.selectedLabel = firstEvent.type;
-				eventValue.text = firstEvent.value;
+				eventValue.text = firstEvent.value + "";
 				eventPos.text = firstEvent.position + "";
 				currentSelectedEventName = firstEvent.name;
 				currentEventPosition = firstEvent.position;
 
 				savedType = firstEvent.type;
-				savedValue = firstEvent.value;
+				savedValue = firstEvent.value + "";
 
 				var listofnames = [];
 	
@@ -838,7 +838,7 @@ class ChartingState extends MusicBeatState
 				trace("bruh");
 				eventType.selectedLabel = firstEventObject.type;
 				trace("bruh");
-				eventValue.text = firstEventObject.value;
+				eventValue.text = firstEventObject.value + "";
 				trace("bruh");
 				currentSelectedEventName = firstEventObject.name;
 				trace("bruh");
@@ -858,7 +858,7 @@ class ChartingState extends MusicBeatState
 					trace('selecting ' + name + ' found: ' + event);
 	
 					eventName.text = event.name;
-					eventValue.text = event.value;
+					eventValue.text = event.value + "";
 					eventPos.text = event.position + "";
 					eventType.selectedLabel = event.type;
 					currentSelectedEventName = event.name;
diff --git a/source/Song.hx b/source/Song.hx
index abbec7f..e3e3055 100644
--- a/source/Song.hx
+++ b/source/Song.hx
@@ -11,10 +11,10 @@ class Event
 {
 	public var name:String;
 	public var position:Float;
-	public var value:Dynamic;
+	public var value:Float;
 	public var type:String;
 
-	public function new(name:String,pos:Float,value:Dynamic,type:String)
+	public function new(name:String,pos:Float,value:Float,type:String)
 	{
 		this.name = name;
 		this.position = pos;
diff --git a/source/smTools/SMHeader.hx b/source/smTools/SMHeader.hx
index 656b15a..80c61a5 100644
--- a/source/smTools/SMHeader.hx
+++ b/source/smTools/SMHeader.hx
@@ -73,13 +73,23 @@ class SMHeader
                     TimingStruct.AllTimings[currentIndex].startTime = data.startTime + data.length;
                 }
 
-                changeEvents.push(new Song.Event(HelperFunctions.truncateFloat(beat,0) + "SM",beat,bpm,"BPM Change"));
+                changeEvents.push(new Song.Event(HelperFunctions.truncateFloat(beat,3) + "SM",beat,bpm,"BPM Change"));
 
                 if (bpmSplit.length == 1)
                     break;
                 currentIndex++;
             }
 
+            for(i in TimingStruct.AllTimings)
+            {
+                trace("BPM - " + i.bpm + " - " + i.startBeat);
+            }
+
+            for(i in changeEvents)
+            {
+                trace("BPM - " + i.value + " - " + i.position);
+            }
+
             trace(changeEvents.length + " - BPM CHANGES");
             return 0.0;
         }