diff --git a/src/main/java/forge/AllZone.java b/src/main/java/forge/AllZone.java
index 1b3c92b39bc..9b764804f4d 100644
--- a/src/main/java/forge/AllZone.java
+++ b/src/main/java/forge/AllZone.java
@@ -105,7 +105,7 @@ public final class AllZone {
     private static DeckManager deckManager;
 
     /** Constant <code>CARD_RATINGS</code>. */
-    private static CardRatings CARD_RATINGS = new CardRatings();
+    private static CardRatings cardRatings = new CardRatings();
 
     /**
      * <p>
@@ -717,7 +717,7 @@ public final class AllZone {
      * @return the CardRatings object
      */
     public static CardRatings getCardRatings() {
-        return AllZone.CARD_RATINGS;
+        return AllZone.cardRatings;
     }
 
 } // AllZone
diff --git a/src/main/java/forge/card/CardColor.java b/src/main/java/forge/card/CardColor.java
index 04d9affd78b..b0a7e6b85dd 100644
--- a/src/main/java/forge/card/CardColor.java
+++ b/src/main/java/forge/card/CardColor.java
@@ -301,6 +301,12 @@ public final class CardColor implements Comparable<CardColor> {
         CardColor.nullColor = nullColor0;
     }
 
+    /**
+     * Shares color with.
+     *
+     * @param ccOther the cc other
+     * @return true, if successful
+     */
     public boolean sharesColorWith(CardColor ccOther) {
 
         if (this.isWhite() && ccOther.isWhite()) {
diff --git a/src/main/java/forge/card/CardType.java b/src/main/java/forge/card/CardType.java
index 39a201dfc73..387c0650dde 100644
--- a/src/main/java/forge/card/CardType.java
+++ b/src/main/java/forge/card/CardType.java
@@ -296,10 +296,21 @@ public final class CardType implements Comparable<CardType> {
         return this.toString().compareTo(o.toString());
     }
 
+    /**
+     * Gets the sub types.
+     *
+     * @return the sub types
+     */
     public List<String> getSubTypes() {
         return this.subType;
     }
 
+    /**
+     * Shares sub type with.
+     *
+     * @param ctOther the ct other
+     * @return true, if successful
+     */
     public boolean sharesSubTypeWith(CardType ctOther) {
         for (String t : ctOther.getSubTypes()) {
             if (this.subTypeContains(t)) {
diff --git a/src/main/java/forge/control/match/ControlHand.java b/src/main/java/forge/control/match/ControlHand.java
index 9b35350d6f5..dbae3ba13ec 100644
--- a/src/main/java/forge/control/match/ControlHand.java
+++ b/src/main/java/forge/control/match/ControlHand.java
@@ -54,7 +54,8 @@ public class ControlHand {
     private MouseAdapter maCardClick;
     private MouseMotionAdapter maCardMove;
 
-    Observer o1;
+    /** The o1. */
+    private Observer o1;
 
     /**
      * Child controller - handles operations related to cards in user's hand and