diff --git a/client/src/main/java/client/Client.java b/client/src/main/java/client/Client.java
index 65c1453..15968cc 100755
--- a/client/src/main/java/client/Client.java
+++ b/client/src/main/java/client/Client.java
@@ -1933,52 +1933,38 @@ public class Client implements IThreadListener {
 					":" + block.getBlock().getMetaFromState(block) + "]" + "\n" + 
 					String.format("Position: %d %d %d", pos.getX(), pos.getY(), pos.getZ())
 				);
-//			int off = 2;
 			for(Entry<IProperty, Comparable> entry : block.getProperties().entrySet()) {
 				str.append("\n" + entry.getKey().getName() + ": " + entry.getValue().toString());
 			}
 
-			return str.toString(); // new String[] {
-//			list.add("");
-//				list.add();
-//			};
+			return str.toString();
 		}
-		else if((this.pointed != null && this.pointed.type == HitPosition.ObjectType.ENTITY
-				&& this.pointed.entity != null) || showPlayerInfo) {
+		else if((this.pointed != null && this.pointed.type == HitPosition.ObjectType.ENTITY && this.pointed.entity != null) || showPlayerInfo) {
 			Entity entity = showPlayerInfo ? this.player : this.pointed.entity;
 			ItemStack held = entity instanceof EntityLiving && ((EntityLiving)entity).getHeldItem() != null ? ((EntityLiving)entity).getHeldItem() : null;
 
 			return 
-//			list.add("");
-				(showPlayerInfo ? "Charakter: " : "Schaue auf: ") + (entity.isPlayer() ? "Player/" : "") + EntityRegistry.getEntityString(entity) + // " [" + (entity.isPlayer() ? "player" : 
-						/* (EntityRegistry.getEntityID(entity) + "/" + EntityRegistry.getObjectID(entity))) + "]" */ " (" + entity.getId() + ")"
-						 + "\n" + 
+				(showPlayerInfo ? "Charakter: " : "Schaue auf: ") + EntityRegistry.getEntityString(entity) + " (" + entity.getId() + ")" + "\n" + 
 				String.format("Position: %.3f %.3f %.3f", entity.posX, entity.posY, entity.posZ) + "\n" + 
-				// list.add("Name: '" + entity.getName() + "'");
 				"Geladen: " + entity.ticksExisted + "t" + (entity instanceof EntityLiving ? (", Alter: " + ((EntityLiving)entity).getGrowingAge()) + "t" : "") + "\n" + 
 				String.format("Größe: %.2fx%.2f, A: %.2f", entity.width, entity.height, entity.getEyeHeight()) + "\n" + 
-	//			if(!this.debugHideInfo) {
 				String.format("Bewegung: %.3f %.3f %.3f", entity.motionX, entity.motionY, entity.motionZ) + "\n" + 
 				String.format("Drehung: %.1f %.1f, K: %.1f", entity.rotYaw, entity.rotPitch, entity.getRotationYawHead()) + "\n" + 
-	//			}
 				(entity instanceof EntityLiving
 					? String.format("Leben: %d/%d, A: %d", ((EntityLiving)entity).getHealth(), ((EntityLiving)entity).getMaxHealth(), 
 							((EntityLiving)entity).getAbsorptionAmount()) : "Leben: n/a") + "\n" + 
-				"Schaden: " + entity.hurtResistance + "t" + (showPlayerInfo ? String.format(", Fallh.: %.3f", entity.fallDistance) : "") + "\n" +  // + ", Luft: " + entity.getAir());
+				"Schaden: " + entity.hurtResistance + "t" + (showPlayerInfo ? String.format(", Fallh.: %.3f", entity.fallDistance) : "") + "\n" +
 				(entity instanceof EntityLiving ?
 					(((EntityLiving)entity).deathTime != 0 ? "Tod: " + ((EntityLiving)entity).deathTime + "t, " : "") + "Rüstung: " + ((EntityLiving)entity).getTotalArmorValue() + ", Pfeile: " + ((EntityLiving)entity).getArrowCountInEntity() 
 					: "Rüstung: n/a, Pfeile: n/a") + "\n" + 
-//					ItemStack held = ((EntityLiving)entity).getHeldItem();
 				(held != null ?
 						"Gegens.: " + ItemRegistry.getNameFromItem(held.getItem()) + " x" + held.size + " (" + held.getMetadata() + ")" : "Gegens.: n/a") + "\n" + 
-				"Eigens.: " + (entity.dead ? "D" : " ") + (entity.noClip ? "N" : " ") + (entity.onGround ? "G" : " ") 
-						+ (entity.canBeCollidedWith() ? "C" : " ") + (entity.canBePushed() ? "P" : " ") 
-						+ (entity.isBurning() ? "B" : " ") // + (entity.isInvisible() ? "I" : " ") // + (entity.isSilent() ? "S" : " ") 
-						+ (entity.isWet() ? "W" : " ") + (entity.canAttackWithItem() ? "A" : " ")
-						+ (entity.passenger != null ? "H" : " ") + (entity.vehicle != null ? "R" : " ") + (entity instanceof EntityLiving ? 
-								("+" /* + (((EntityLivingBase)entity).isEntityUndead() ? "U" : " ") */ // + (((EntityLivingBase)entity).isChild() ? "C" : " ")
-								+ (((EntityLiving)entity).doesEntityNotTriggerPressurePlate() ? "P" : " ")) : "") + "\n" + 
-	//			list.add("UUID: " + entity.getUniqueID().toString());
+				"Eigens.: " + (entity.dead ? "D" : "") + (entity.noClip ? "N" : "") + (entity.onGround ? "G" : "") 
+						+ (entity.canBeCollidedWith() ? "C" : "") + (entity.canBePushed() ? "P" : "") 
+						+ (entity.isBurning() ? "B" : "") + (entity.isPlayer() ? "S" : "") 
+						+ (entity.isWet() ? "W" : "") + (entity.canAttackWithItem() ? "A" : "")
+						+ (entity.passenger != null ? "H" : "") + (entity.vehicle != null ? "R" : "")
+						+ (entity.doesEntityNotTriggerPressurePlate() ? "L" : "") + "\n" + 
 				(entity.hasCustomName() ? "Name: '" + TextColor.stripCodes(entity.getCustomNameTag()) + "'" : "Name: n/a")
 			;
 		}