diff --git a/src/main/java/org/bukkit/ItemStack.java b/src/main/java/org/bukkit/ItemStack.java
index e90a5fe5..b2a4c6f4 100644
--- a/src/main/java/org/bukkit/ItemStack.java
+++ b/src/main/java/org/bukkit/ItemStack.java
@@ -126,6 +126,11 @@ public class ItemStack {
         return -1;
     }
 
+    @Override
+    public String toString() {
+        return "ItemStack{"+getType().name()+" x "+getAmount()+"}";
+    }
+
     @Override
     public boolean equals(Object object) {
         return false;
diff --git a/src/main/java/org/bukkit/PlayerInventory.java b/src/main/java/org/bukkit/PlayerInventory.java
index 419eb07b..9dfffc6d 100644
--- a/src/main/java/org/bukkit/PlayerInventory.java
+++ b/src/main/java/org/bukkit/PlayerInventory.java
@@ -1,7 +1,5 @@
 package org.bukkit;
 
-import java.util.ArrayList;
-
 /**
  * Includes interface to the 4 armor slots
  */
@@ -11,7 +9,7 @@ public interface PlayerInventory extends Inventory {
      * 
      * @return All the ItemStacks from the armor slots
      */
-    public ArrayList<ItemStack> getArmorContents();
+    public ItemStack[] getArmorContents();
 
     /**
      * Return the ItemStack from the helmet slot