diff --git a/Assets/Cryville/Crtr/ChartPlayer.cs b/Assets/Cryville/Crtr/ChartPlayer.cs
index 33d5280..46243f7 100644
--- a/Assets/Cryville/Crtr/ChartPlayer.cs
+++ b/Assets/Cryville/Crtr/ChartPlayer.cs
@@ -538,10 +538,10 @@ namespace Cryville.Crtr {
 					foreach (var ts in gs.Value.Children) {
 						ContainerHandler th;
 						if (ts.Key is Chart.Note) {
-							th = new NoteHandler(gh, (Chart.Note)ts.Key, pruleset);
+							th = new NoteHandler((Chart.Note)ts.Key, gh);
 						}
 						else {
-							th = new TrackHandler(gh, (Chart.Track)ts.Key);
+							th = new TrackHandler((Chart.Track)ts.Key, gh);
 						}
 						ts.Value.AttachHandler(th);
 					}
diff --git a/Assets/Cryville/Crtr/Event/ContainerHandler.cs b/Assets/Cryville/Crtr/Event/ContainerHandler.cs
index 3cbe67a..f36b475 100644
--- a/Assets/Cryville/Crtr/Event/ContainerHandler.cs
+++ b/Assets/Cryville/Crtr/Event/ContainerHandler.cs
@@ -137,7 +137,7 @@ namespace Cryville.Crtr.Event {
 		public virtual void Update(ContainerState s, StampedEvent ev) {
 			bool flag = !Awoken && s.CloneType >= 2 && s.CloneType < 16;
 			if (flag) PreAwake(s);
-			if (s.CloneType <= 2) if (gogroup) skinContainer.MatchDynamic(s);
+			if (gogroup && s.CloneType <= 2) skinContainer.MatchDynamic(s);
 			if (flag) Awake(s);
 		}
 		public virtual void ExUpdate(ContainerState s, StampedEvent ev) {
diff --git a/Assets/Cryville/Crtr/NoteHandler.cs b/Assets/Cryville/Crtr/NoteHandler.cs
index 9423818..818d233 100644
--- a/Assets/Cryville/Crtr/NoteHandler.cs
+++ b/Assets/Cryville/Crtr/NoteHandler.cs
@@ -10,11 +10,9 @@ namespace Cryville.Crtr {
 	public class NoteHandler : ContainerHandler {
 		readonly GroupHandler gh;
 		public readonly Chart.Note Event;
-		readonly PdtRuleset ruleset;
-		public NoteHandler(GroupHandler gh, Chart.Note ev, PdtRuleset rs) : base() {
-			this.gh = gh;
+		public NoteHandler(Chart.Note ev, GroupHandler gh) : base() {
 			Event = ev;
-			ruleset = rs;
+			this.gh = gh;
 		}
 		
 		public override string TypeName {
@@ -46,8 +44,8 @@ namespace Cryville.Crtr {
 			base.PreInit();
 			foreach (var j in Event.judges) {
 				judges.Add(j, new JudgeState(this, j.Id.Key));
-				}
 			}
+		}
 		public override void Init() {
 			base.Init();
 			sgos = gogroup.GetComponentsInChildren<SectionalGameObject>();
diff --git a/Assets/Cryville/Crtr/TrackHandler.cs b/Assets/Cryville/Crtr/TrackHandler.cs
index 87d9fe4..b4ebc21 100644
--- a/Assets/Cryville/Crtr/TrackHandler.cs
+++ b/Assets/Cryville/Crtr/TrackHandler.cs
@@ -7,8 +7,8 @@ namespace Cryville.Crtr {
 		readonly GroupHandler gh;
 		readonly Chart.Track track;
 
-		public TrackHandler(GroupHandler gh, Chart.Track _track) : base() {
-			track = _track;
+		public TrackHandler(Chart.Track ev, GroupHandler gh) : base() {
+			track = ev;
 			this.gh = gh;
 		}