diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/Badges.java b/src/com/shatteredpixel/shatteredpixeldungeon/Badges.java
index 8d8836855..2f7b444bf 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/Badges.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/Badges.java
@@ -705,7 +705,7 @@ public class Badges {
 		}
 	}
 
-    //TODO: Replace this badge
+    //TODO: Replace this badge, Delayed to 0.2.1
 	public static void validateRingOfHaggler() {
 		if (!local.contains( Badge.RING_OF_HAGGLER )/* && new RingOfThorns().isKnown()*/) {
 			Badge badge = Badge.RING_OF_HAGGLER;
@@ -714,7 +714,7 @@ public class Badges {
 		}
 	}
 
-    //TODO: Replace this badge
+    //TODO: Replace this badge, Delayed to 0.2.1
 	public static void validateRingOfThorns() {
 		if (!local.contains( Badge.RING_OF_THORNS )/* && new RingOfThorns().isKnown()*/) {
 			Badge badge = Badge.RING_OF_THORNS;
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/Ankh.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Ankh.java
index 77eaad3a0..2c22cb0dd 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/Ankh.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Ankh.java
@@ -128,9 +128,7 @@ public class Ankh extends Item {
     @Override
     public void restoreFromBundle( Bundle bundle ) {
         super.restoreFromBundle( bundle );
-        //TODO: remove when saves from 0.1.1 are invalidated
-        if (bundle.contains( BLESSED ))
-            blessed	= bundle.getBoolean( BLESSED );
+        blessed	= bundle.getBoolean( BLESSED );
     }
 	
 	@Override
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java
index 93953499d..9c12e8bb5 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java
@@ -15,7 +15,7 @@ import java.util.ArrayList;
  * Created by Evan on 24/08/2014.
  */
 public class Artifact extends KindofMisc {
-
+//TODO: add artifact transform method and tie it into well of transformation
     {
         levelKnown = true;
     }
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java
index 93bf6b42c..b929b39e4 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java
@@ -16,7 +16,7 @@ import com.watabou.utils.Random;
  * Created by debenhame on 03/09/2014.
  */
 public class CapeOfThorns extends Artifact {
-    //TODO: add polish, testing
+    //TODO: add polish, testing, numbers tweaking
 
     {
         name = "Cape of Thorns";
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java
index fc9938775..7f0588a9b 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
 public class ChaliceOfBlood extends Artifact {
     //TODO: add polish
     //TODO: add sprite switching
+    //TODO: decide on max level 8 or 10. balance accordingly.
 
     private static final String TXT_CHALICE	= "Chalice of Blood";
     private static final String TXT_YES		= "Yes, I know what I'm doing";
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java
index e5a93001a..dbead6cd6 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java
@@ -19,7 +19,7 @@ import java.util.ArrayList;
  * Created by debenhame on 25/08/2014.
  */
 public class CloakOfShadows extends Artifact {
-    //TODO: testing, add polish
+    //TODO: final numbers tweaking, add polish
 
     {
         name = "Cloak of Shadows";
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java
index d0c26a5ef..75f1b838e 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java
@@ -26,7 +26,7 @@ import java.util.ArrayList;
  */
 public class HornOfPlenty extends Artifact {
 
-    //TODO: tune numbers, add sprite switching, add polish.
+    //TODO: add sprite switching, add polish.
 
     {
         name = "Horn of Plenty";
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java
index 7ad3ba495..daef8457c 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java
@@ -26,6 +26,7 @@ import java.util.Collections;
  * Created by debenhame on 08/09/2014.
  */
 public class SandalsOfNature extends Artifact {
+    //todo: test, add sprite switching, number tweaking.
 
     {
         name = "Sandals of Nature";
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Blandfruit.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Blandfruit.java
index da58d76a5..4c3d7bcf7 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Blandfruit.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Blandfruit.java
@@ -233,7 +233,6 @@ public class Blandfruit extends Food {
         if (name.equals("Healthfruit"))
             cook(new Sungrass.Seed());
         else if (name.equals("Powerfruit"))
-            //TODO: make sure this doesn't break anything
             cook(new Wandmaker.Rotberry.Seed());
         else if (name.equals("Paralyzefruit"))
             cook(new Earthroot.Seed());
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java
index 440b81afd..ae2aaf8d4 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java
@@ -223,8 +223,6 @@ public class Potion extends Item {
     @Override
     public void cast( final Hero user, int dst ) {
             super.cast(user, dst);
-            //if this potion is owned by a fruit, finds it and detaches it.
-            //TODO: add remove code here
     }
 	
 	public boolean isKnown() {
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfAccuracy.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfAccuracy.java
index a392fa1cd..c865199ce 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfAccuracy.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfAccuracy.java
@@ -18,6 +18,7 @@
 package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
 public class RingOfAccuracy extends Ring {
+    //TODO: numbers tweaking
 
 	{
 		name = "Ring of Accuracy";
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfElements.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfElements.java
index e4aa22eb3..8a21fd7aa 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfElements.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfElements.java
@@ -29,6 +29,7 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.traps.LightningTrap;
 import com.watabou.utils.Random;
 
 public class RingOfElements extends Ring {
+    //TODO: need to rebalance this
 
 	{
 		name = "Ring of Elements";
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfEvasion.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfEvasion.java
index 7791c742f..510f4be8a 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfEvasion.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfEvasion.java
@@ -24,6 +24,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass;
 import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
 
 public class RingOfEvasion extends Ring {
+    //todo: testing, numbers tweaking
 
 	{
 		name = "Ring of Evasion";
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHaste.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHaste.java
index 18f29ffcc..f3d0ad96b 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHaste.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHaste.java
@@ -18,6 +18,7 @@
 package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
 public class RingOfHaste extends Ring {
+    //TODO: numbers tweaking
 
 	{
 		name = "Ring of Haste";
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMagic.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMagic.java
index 572983ed7..a374a7e0f 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMagic.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMagic.java
@@ -18,6 +18,7 @@
 package com.shatteredpixel.shatteredpixeldungeon.items.rings;
 
 public class RingOfMagic extends Ring {
+    //TODO: evaluate functionality, decide on numbers
 	
 	{
 		name = "Ring of Magic";
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java
index 47dbceeb3..03b2f81ea 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java
@@ -32,7 +32,6 @@ public class Quarterstaff extends MeleeWeapon {
 	
 	@Override
 	public String desc() {
-		// TODO Auto-generated method stub
 		return "A staff of hardwood, its ends are shod with iron.";
 	}
 }
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java
index 5754b6727..6574a850e 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java
@@ -150,10 +150,6 @@ public class Sungrass extends Plant {
 		public void restoreFromBundle( Bundle bundle ) {
 			super.restoreFromBundle( bundle );
 			pos = bundle.getInt( POS );
-            //to support legacy saves from 0.1.0, TODO: remove when saves from V0.1.0 are invalidated
-                if (!bundle.contains( LEVEL )){
-                return;
-            }
             healCurr = bundle.getInt( HEALCURR );
             count = bundle.getInt( COUNT );
             level = bundle.getInt( LEVEL );