diff --git a/Mage.Common/src/mage/view/PlayerView.java b/Mage.Common/src/mage/view/PlayerView.java
index ac1dffe5c5..d2b1e374be 100644
--- a/Mage.Common/src/mage/view/PlayerView.java
+++ b/Mage.Common/src/mage/view/PlayerView.java
@@ -59,11 +59,11 @@ public class PlayerView implements Serializable {
     private final boolean hasLeft;
     private final ManaPoolView manaPool;
     private final SimpleCardsView graveyard = new SimpleCardsView();
-    private final Map<UUID, PermanentView> battlefield = new LinkedHashMap<UUID, PermanentView>();
+    private final Map<UUID, PermanentView> battlefield = new LinkedHashMap<>();
     private final CardView topCard;
     private final UserDataView userDataView;
-    private final List<CommandObjectView> commandList = new ArrayList<CommandObjectView>();
-    private final List<UUID> attachments = new ArrayList<UUID>();
+    private final List<CommandObjectView> commandList = new ArrayList<>();
+    private final List<UUID> attachments = new ArrayList<>();
     private final int statesSavedSize;
     private final int priorityTimeLeft;
 
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TranscendentMaster.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TranscendentMaster.java
index 578c3e4b9b..b336d4dd03 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TranscendentMaster.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TranscendentMaster.java
@@ -57,7 +57,15 @@ public class TranscendentMaster extends LevelerCard<TranscendentMaster> {
 
         this.addAbility(new LevelUpAbility(new ManaCostsImpl("{1}")));
 
+        // Level up {1} ({1}: Put a level counter on this. Level up only as a sorcery.)
+        // LEVEL 6-11
+        // 6/6
+        // Lifelink
         Abilities<Ability> abilities1 = new AbilitiesImpl<Ability>(LifelinkAbility.getInstance());
+        // LEVEL 12+
+        // 9/9
+        // Lifelink
+        // Transcendent Master is indestructible.
         Abilities<Ability> abilities2 = new AbilitiesImpl<Ability>(
                 LifelinkAbility.getInstance(),
                 IndestructibleAbility.getInstance());
diff --git a/Mage/src/mage/abilities/StaticAbility.java b/Mage/src/mage/abilities/StaticAbility.java
index 8cc31d9bdd..6a0def64c6 100644
--- a/Mage/src/mage/abilities/StaticAbility.java
+++ b/Mage/src/mage/abilities/StaticAbility.java
@@ -50,7 +50,7 @@ public abstract class StaticAbility<T extends StaticAbility<T>> extends AbilityI
         }
     }
 
-    public StaticAbility(StaticAbility ability) {
+    public StaticAbility(StaticAbility<T> ability) {
         super(ability);
     }
 }
diff --git a/Mage/src/mage/abilities/keyword/LevelerCardBuilder.java b/Mage/src/mage/abilities/keyword/LevelerCardBuilder.java
index 3ca91ba20f..cf67b872b1 100644
--- a/Mage/src/mage/abilities/keyword/LevelerCardBuilder.java
+++ b/Mage/src/mage/abilities/keyword/LevelerCardBuilder.java
@@ -63,7 +63,7 @@ public class LevelerCardBuilder {
     private int toughness;
     private String rule = "";
 
-    private Abilities<Ability> abilities = new AbilitiesImpl<Ability>();
+    private Abilities<Ability> abilities = new AbilitiesImpl<>();
 
     /**
      * Main method constructing ability.
@@ -71,7 +71,7 @@ public class LevelerCardBuilder {
      * @return
      */
     public List<Ability> build() {
-        List<Ability> constructed = new ArrayList<Ability>();
+        List<Ability> constructed = new ArrayList<>();
 
         Condition condition = new SourceHasCounterCondition(CounterType.LEVEL, level1, level2);
         for (Ability ability : abilities) {
@@ -173,12 +173,12 @@ public class LevelerCardBuilder {
 
     public static class LevelAbility {
 
-        private int level1;
-        private int level2;
-        private int power;
-        private int toughness;
+        private final int level1;
+        private final int level2;
+        private final int power;
+        private final int toughness;
 
-        private Abilities<Ability> abilities = new AbilitiesImpl<Ability>();
+        private Abilities<Ability> abilities = new AbilitiesImpl<>();
 
         public LevelAbility(int level1, int level2, Abilities<Ability> abilities, int power, int toughness) {
             this.level1 = level1;
diff --git a/Mage/src/mage/cards/CardImpl.java b/Mage/src/mage/cards/CardImpl.java
index b28c7c3155..a9812f60fa 100644
--- a/Mage/src/mage/cards/CardImpl.java
+++ b/Mage/src/mage/cards/CardImpl.java
@@ -129,7 +129,7 @@ public abstract class CardImpl<T extends CardImpl<T>> extends MageObjectImpl<T>
         cardNumber = card.cardNumber;
         expansionSetCode = card.expansionSetCode;
         rarity = card.rarity;
-        for (Watcher watcher: (List<Watcher>)card.watchers) {
+        for (Watcher watcher: (List<Watcher>)card.getWatchers()) {
             watchers.add(watcher.copy());
         }
         faceDown = card.faceDown;
@@ -276,7 +276,7 @@ public abstract class CardImpl<T extends CardImpl<T>> extends MageObjectImpl<T>
 
     @Override
     public List<Mana> getMana() {
-        List<Mana> mana = new ArrayList<Mana>();
+        List<Mana> mana = new ArrayList<>();
         for (ManaAbility ability : this.abilities.getManaAbilities(Zone.BATTLEFIELD)) {
             mana.add(ability.getNetMana(null));
         }