diff --git a/SuperpositionGame/src/main/scala/superposition/Laser.scala b/SuperpositionGame/src/main/scala/superposition/Laser.scala
index ad79ba9..e702e18 100644
--- a/SuperpositionGame/src/main/scala/superposition/Laser.scala
+++ b/SuperpositionGame/src/main/scala/superposition/Laser.scala
@@ -24,6 +24,7 @@ private object Laser {
 
     val laser = lasers.head
     if (lasers.exists(_.justFired)) {
+      // TODO: Search the laser beam for each universe because the target cells might be different.
       val targetCell = laser.beam.take(50).find(cell =>
         multiverse.walls.contains(cell) ||
           lasers.exists(_.universeObject.universe.objects.values.exists(_.cell == cell))
@@ -34,6 +35,7 @@ private object Laser {
           if (laser.control.isEmpty) {
             multiverse.applyGate(laser.gate, targetId, None, PositionControl(targetId, targetCell.get))
           } else {
+            // TODO: Make sure the target and control aren't the same.
             val controlId = multiverse.bitsInCell(laser.control.get).head
             multiverse.applyGate(
               laser.gate, targetId, None,
diff --git a/SuperpositionGame/src/main/scala/superposition/Player.scala b/SuperpositionGame/src/main/scala/superposition/Player.scala
index 149ada5..9457c0b 100644
--- a/SuperpositionGame/src/main/scala/superposition/Player.scala
+++ b/SuperpositionGame/src/main/scala/superposition/Player.scala
@@ -51,6 +51,7 @@ private object Player {
     }
   }
 
+  // TODO: Refactor this method.
   private def move(multiverse: Multiverse, id: UniversalId, players: Iterable[Player]): Unit = {
     var diff = new Vec2d(0, 0)
     if (Input.keyDown(GLFW_KEY_A)) {
diff --git a/SuperpositionGame/src/main/scala/superposition/Quball.scala b/SuperpositionGame/src/main/scala/superposition/Quball.scala
index fb74c42..0722837 100644
--- a/SuperpositionGame/src/main/scala/superposition/Quball.scala
+++ b/SuperpositionGame/src/main/scala/superposition/Quball.scala
@@ -32,7 +32,7 @@ private final class Quball(universe: Universe,
     this,
     HashMap("on" -> false, "carried" -> false),
     "on",
-    map => sprite.color = if (map("on")) WHITE else BLACK
+    state => sprite.color = if (state("on")) WHITE else BLACK
   ))
 
   override def copy(): Quball = {