diff --git a/src/de/teamteamteam/spacescooter/entity/Animation.java b/src/de/teamteamteam/spacescooter/entity/Animation.java
index a412d76..70c4756 100644
--- a/src/de/teamteamteam/spacescooter/entity/Animation.java
+++ b/src/de/teamteamteam/spacescooter/entity/Animation.java
@@ -4,6 +4,7 @@ package de.teamteamteam.spacescooter.entity;
  * A very simple image slideshow animation.
  * Given a list of images and an interval, it does a (fast) slideshow
  * through all the images, changing them after <interval> ticks.
+ * TODO: Implement an AnimationType that allows looping! Maybe separate Entities into Drawable and Updateable?
  */
 public class Animation extends Entity {
 
diff --git a/src/de/teamteamteam/spacescooter/entity/StaticValue.java b/src/de/teamteamteam/spacescooter/entity/StaticValue.java
index b9e122c..5c51c7f 100644
--- a/src/de/teamteamteam/spacescooter/entity/StaticValue.java
+++ b/src/de/teamteamteam/spacescooter/entity/StaticValue.java
@@ -1,6 +1,7 @@
 package de.teamteamteam.spacescooter.entity;
 
 /**
+ * TODO: Rename and merge with other classes containing single static information.
  * Static Values for the Player and the Shop
  *
  */
diff --git a/src/de/teamteamteam/spacescooter/gui/Credits.java b/src/de/teamteamteam/spacescooter/gui/Credits.java
index 1d80899..84720b8 100644
--- a/src/de/teamteamteam/spacescooter/gui/Credits.java
+++ b/src/de/teamteamteam/spacescooter/gui/Credits.java
@@ -1,6 +1,7 @@
 package de.teamteamteam.spacescooter.gui;
 
 /**
+ * TODO: Intelligently merge this with Score class.
  * Static class accounting the credits a player earned during the game.
  */
 public class Credits {
diff --git a/src/de/teamteamteam/spacescooter/gui/InterfaceBar.java b/src/de/teamteamteam/spacescooter/gui/InterfaceBar.java
index 48ff71f..8c51392 100644
--- a/src/de/teamteamteam/spacescooter/gui/InterfaceBar.java
+++ b/src/de/teamteamteam/spacescooter/gui/InterfaceBar.java
@@ -7,6 +7,7 @@ import de.teamteamteam.spacescooter.entity.Entity;;
 
 public class InterfaceBar extends Entity {
 
+	//TODO: Use GameConfig constants for this!
 	private int width = 800;
 	private int height = 50;
 	
diff --git a/src/de/teamteamteam/spacescooter/gui/ShieldBar.java b/src/de/teamteamteam/spacescooter/gui/ShieldBar.java
index ea80ca9..302da8b 100644
--- a/src/de/teamteamteam/spacescooter/gui/ShieldBar.java
+++ b/src/de/teamteamteam/spacescooter/gui/ShieldBar.java
@@ -10,6 +10,7 @@ import de.teamteamteam.spacescooter.screen.GameScreen;
 
 public class ShieldBar extends Entity {
 
+	//TODO: Make this depends on GameConfig constants
 	private int width = 150;
 	private int height = 14;
 	private int shield = 0;
diff --git a/src/de/teamteamteam/spacescooter/gui/ShopOfferValue.java b/src/de/teamteamteam/spacescooter/gui/ShopOfferValue.java
index 3d66ec5..d44c03e 100644
--- a/src/de/teamteamteam/spacescooter/gui/ShopOfferValue.java
+++ b/src/de/teamteamteam/spacescooter/gui/ShopOfferValue.java
@@ -2,6 +2,7 @@ package de.teamteamteam.spacescooter.gui;
 
 import de.teamteamteam.spacescooter.entity.Entity;
 
+//TODO: Create an ImageEntity to do this.
 public class ShopOfferValue extends Entity{
 
 	public ShopOfferValue(int x, int y, String filename) {
diff --git a/src/de/teamteamteam/spacescooter/sound/SoundSystem.java b/src/de/teamteamteam/spacescooter/sound/SoundSystem.java
index 39ca395..d5b9093 100644
--- a/src/de/teamteamteam/spacescooter/sound/SoundSystem.java
+++ b/src/de/teamteamteam/spacescooter/sound/SoundSystem.java
@@ -151,6 +151,7 @@ public class SoundSystem {
 
 	/**
 	 * Play a sound by passing a relative path to this method.
+	 * TODO: Provide a method to stop existing sounds (aka BackgroundMusic!)
 	 */
 	public static void playSound(String filename) {
 		SoundSystem.playFromAudioInputStream(Loader.getSoundURLByFilename(filename));