diff --git a/dexlib/src/main/java/org/jf/dexlib/DexFile.java b/dexlib/src/main/java/org/jf/dexlib/DexFile.java
index 6086b1cc..ad44cd73 100644
--- a/dexlib/src/main/java/org/jf/dexlib/DexFile.java
+++ b/dexlib/src/main/java/org/jf/dexlib/DexFile.java
@@ -519,6 +519,11 @@ public class DexFile
      * signature and checksum in the header
      */
     public void writeTo(AnnotatedOutput out) {
+
+        out.annotate(0, "-----------------------------");
+        out.annotate(0, "header item");
+        out.annotate(0, "-----------------------------");
+        out.annotate(0, " ");
         HeaderItem.writeTo(out);
 
         int sectionsPosition = 0;
diff --git a/dexlib/src/main/java/org/jf/dexlib/Item.java b/dexlib/src/main/java/org/jf/dexlib/Item.java
index 8c7c6b54..d6dad14b 100644
--- a/dexlib/src/main/java/org/jf/dexlib/Item.java
+++ b/dexlib/src/main/java/org/jf/dexlib/Item.java
@@ -95,7 +95,7 @@ public abstract class Item<T extends Item> implements Comparable<T> {
         assert out.getCursor() == offset;
 
         if (out.annotates()) {
-            out.annotate(0, "[0x" + Integer.toHexString(index) + "] " + this.getItemType().TypeName);
+            out.annotate(0, "[" + index + "] " + this.getItemType().TypeName);
         }
 
         out.indent();
diff --git a/dexlib/src/main/java/org/jf/dexlib/Section.java b/dexlib/src/main/java/org/jf/dexlib/Section.java
index ef8aa1a0..e9650424 100644
--- a/dexlib/src/main/java/org/jf/dexlib/Section.java
+++ b/dexlib/src/main/java/org/jf/dexlib/Section.java
@@ -106,13 +106,18 @@ public abstract class Section<T extends Item> {
      * @param out the <code>AnnotatedOutput</code> object to write to
      */
     protected void writeTo(AnnotatedOutput out) {
+        out.annotate(0, " ");
+        out.annotate(0, "-----------------------------");
+        out.annotate(0, this.ItemType.TypeName + " section");
+        out.annotate(0, "-----------------------------");
+        out.annotate(0, " ");
+
         for (Item item: items) {
             assert item!=null;
             out.alignTo(ItemType.ItemAlignment);
             item.writeTo(out);
             out.annotate(0, " ");
         }
-        out.annotate(0, " ");
     }
 
     /**