diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/ABC.java b/trunk/src/com/jpexs/decompiler/flash/abc/ABC.java
index e24cdd082..c98ca06d9 100644
--- a/trunk/src/com/jpexs/decompiler/flash/abc/ABC.java
+++ b/trunk/src/com/jpexs/decompiler/flash/abc/ABC.java
@@ -861,5 +861,32 @@ public class ABC {
       for (int i = 0; i < bodies.length; i++) {
          bodies[i].autoFillStats(this);
       }
+   }   
+   
+   public int findMethodBodyByName(int classId,String methodName){
+      if(classId>-1){
+         for(Trait t:instance_info[classId].instance_traits.traits){
+            if(t instanceof TraitMethodGetterSetter){
+               if(t.getName(this).getName(constants, new ArrayList<String>()).equals(methodName)){
+                  return findBodyIndex(((TraitMethodGetterSetter)t).method_info);
+               }
+            }
+         }
+      }
+      return -1;
+   }
+   public int findMethodBodyByName(String className,String methodName){
+      int classId=findClassByName(className);
+      return findMethodBodyByName(classId,methodName);
+   }
+   
+   public int findClassByName(String name){
+      for(int c=0;c<instance_info.length;c++){
+         String s=constants.constant_multiname[instance_info[c].name_index].getNameWithNamespace(constants);
+         if(name.equals(s)){
+            return c;
+         }
+      }
+      return -1;
    }
 }
diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java
index 13b71a88f..d9cdc3801 100644
--- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java
+++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java
@@ -33,6 +33,7 @@ import com.jpexs.decompiler.flash.abc.avm2.treemodel.NextNameTreeItem;
 import com.jpexs.decompiler.flash.abc.avm2.treemodel.NextValueTreeItem;
 import com.jpexs.decompiler.flash.abc.avm2.treemodel.NullTreeItem;
 import com.jpexs.decompiler.flash.abc.avm2.treemodel.ReturnValueTreeItem;
+import com.jpexs.decompiler.flash.abc.avm2.treemodel.ReturnVoidTreeItem;
 import com.jpexs.decompiler.flash.abc.avm2.treemodel.SetLocalTreeItem;
 import com.jpexs.decompiler.flash.abc.avm2.treemodel.SetTypeTreeItem;
 import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.ExceptionTreeItem;
@@ -1422,7 +1423,7 @@ public class AVM2Graph extends Graph {
          }
 
          GraphTargetItem ti = checkLoop(next, stopPart, loops);
-         Loop currentLoop = new Loop(null, next);
+         Loop currentLoop = new Loop(loops.size(),null, next);
          loops.add(currentLoop);
          //switchLoc.getNextPartPath(new ArrayList<GraphPart>());
          List<Integer> valuesMapping = new ArrayList<Integer>();
@@ -1496,7 +1497,14 @@ public class AVM2Graph extends Graph {
    }
 
    @Override
-   protected void finalProcess(List<GraphTargetItem> list) {      
+   protected void finalProcess(List<GraphTargetItem> list, int level) {     
+      if(level==0){
+         if(!list.isEmpty()){
+            if(list.get(list.size()-1) instanceof ReturnVoidTreeItem){
+               list.remove(list.size()-1);
+            }
+         }
+      }
       for(int i=0;i<list.size();i++){
          if(list.get(i) instanceof WhileItem){
             WhileItem w=(WhileItem)list.get(i);
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java
index ce8f94fe4..4ae56625e 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java
@@ -63,7 +63,7 @@ public class ActionGraph extends Graph {
    }
 
    @Override
-   protected void finalProcess(List<GraphTargetItem> list) {
+   protected void finalProcess(List<GraphTargetItem> list,int level) {
       List<GraphTargetItem> ret = Action.checkClass(list);
       if (ret != list) {
          list.clear();
@@ -178,7 +178,7 @@ public class ActionGraph extends Graph {
             next = breakPart;
 
             GraphTargetItem ti = checkLoop(next, stopPart, loops);
-            Loop currentLoop = new Loop(null, next);
+            Loop currentLoop = new Loop(loops.size(),null, next);
             loops.add(currentLoop);
             //switchLoc.getNextPartPath(new ArrayList<GraphPart>());
             List<Integer> valuesMapping = new ArrayList<Integer>();
diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java b/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java
index 563828b24..40858115e 100644
--- a/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java
+++ b/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java
@@ -291,23 +291,23 @@ public class Graph {
          populateParts(head, allParts);
       }
       List<GraphTargetItem> ret = printGraph(localData, new Stack<GraphTargetItem>(), allParts, null, heads.get(0), null, new ArrayList<Loop>(), new HashMap<Loop, List<GraphTargetItem>>());
-      finalProcessAll(ret);
+      finalProcessAll(ret,0);
       return ret;
    }
 
-   private void finalProcessAll(List<GraphTargetItem> list) {
-      finalProcess(list);
+   private void finalProcessAll(List<GraphTargetItem> list,int level) {
+      finalProcess(list,level);
       for (GraphTargetItem item : list) {
          if (item instanceof Block) {
             List<List<GraphTargetItem>> subs = ((Block) item).getSubs();
             for (List<GraphTargetItem> sub : subs) {
-               finalProcessAll(sub);
+               finalProcessAll(sub,level+1);
             }
          }
       }
    }
 
-   protected void finalProcess(List<GraphTargetItem> list) {
+   protected void finalProcess(List<GraphTargetItem> list,int level) {
    }
 
    protected List<GraphPart> getLoopsContinues(List<Loop> loops) {
@@ -831,7 +831,7 @@ public class Graph {
       if ((!part.nextParts.isEmpty()) && part.nextParts.get(0).leadsTo(part, loopContinues)) {
          if ((part.nextParts.size() > 1) && part.nextParts.get(1).leadsTo(part, loopContinues)) {
             if (output.isEmpty()) {
-               whileTrueLoop = new Loop(part, null);
+               whileTrueLoop = new Loop(loops.size(),part, null);
                loops.add(whileTrueLoop);
                whileTrue = true;
             } else {
@@ -851,8 +851,9 @@ public class Graph {
          if (loop && output.isEmpty()) {
             doWhile = false;
          }
-         Loop currentLoop = new Loop(part, null);
+         Loop currentLoop = null;
          if (loop) {
+            currentLoop=new Loop(loops.size(),part, null);
             loops.add(currentLoop);
          }
 
@@ -863,7 +864,7 @@ public class Graph {
             }
          }
 
-         if ((part.nextParts.size() > 1) && (!doWhile)) {
+         if (loop && (part.nextParts.size() > 1) && (!doWhile)) {
             currentLoop.loopBreak = part.nextParts.get(reversed ? 0 : 1);
          }
 
diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/Loop.java b/trunk/src/com/jpexs/decompiler/flash/graph/Loop.java
index daa9014bc..3d0c7569f 100644
--- a/trunk/src/com/jpexs/decompiler/flash/graph/Loop.java
+++ b/trunk/src/com/jpexs/decompiler/flash/graph/Loop.java
@@ -25,12 +25,10 @@ public class Loop {
    public GraphPart loopContinue;
    public GraphPart loopBreak;
    public long id;
-   static long maxLoopId = 0;
 
-   public Loop(GraphPart loopContinue, GraphPart loopBreak) {
+   public Loop(long id, GraphPart loopContinue, GraphPart loopBreak) {
       this.loopContinue = loopContinue;
       this.loopBreak = loopBreak;
-      id = maxLoopId;
-      maxLoopId++;
+      this.id=id;
    }
 }