diff --git a/trunk/src/com/jpexs/decompiler/flash/SWF.java b/trunk/src/com/jpexs/decompiler/flash/SWF.java
index 7a4558a9e..8f4bf0c14 100644
--- a/trunk/src/com/jpexs/decompiler/flash/SWF.java
+++ b/trunk/src/com/jpexs/decompiler/flash/SWF.java
@@ -1100,7 +1100,7 @@ public class SWF {
             }
         }
         for (ASMSource src : actionsMap.keySet()) {
-            actionsMap.put(src, Action.removeNops(actionsMap.get(src), version));
+            actionsMap.put(src, Action.removeNops(0, actionsMap.get(src), version, 0));
             src.setActions(actionsMap.get(src), version);
         }
         return ret;
diff --git a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java
index 44df6e619..0867b283a 100644
--- a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java
+++ b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java
@@ -18,8 +18,6 @@ package com.jpexs.decompiler.flash;
 
 import com.jpexs.decompiler.flash.action.Action;
 import com.jpexs.decompiler.flash.action.ActionGraphSource;
-import com.jpexs.decompiler.flash.action.parser.ASMParser;
-import com.jpexs.decompiler.flash.action.parser.ParseException;
 import com.jpexs.decompiler.flash.action.special.ActionContainer;
 import com.jpexs.decompiler.flash.action.special.ActionEnd;
 import com.jpexs.decompiler.flash.action.special.ActionNop;
@@ -51,7 +49,6 @@ import com.jpexs.decompiler.flash.types.shaperecords.EndShapeRecord;
 import com.jpexs.decompiler.flash.types.shaperecords.SHAPERECORD;
 import com.jpexs.decompiler.flash.types.shaperecords.StraightEdgeRecord;
 import com.jpexs.decompiler.flash.types.shaperecords.StyleChangeRecord;
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -490,9 +487,13 @@ public class SWFInputStream extends InputStream {
         return ret;
     }
 
-    public List<Action> readActionList() throws IOException {
+    public List<Action> readActionList(long address, long containerSWFOffset) throws IOException {
         ReReadableInputStream rri = new ReReadableInputStream(this);
-        return readActionList(rri, version, 0);
+        return readActionList(address, containerSWFOffset, rri, version, 0, -1);
+    }
+
+    public List<Action> readActionList(long address, long containerSWFOffset, ReReadableInputStream rri, int maxlen) throws IOException {
+        return readActionList(address, containerSWFOffset, rri, version, rri.getPos(), rri.getPos() + maxlen);
     }
 
     private static void getConstantPool(ConstantPool cpool, List localData, Stack<GraphTargetItem> stack, List<GraphTargetItem> output, ActionGraphSource code, int ip, int lastIp, List<ConstantPool> constantPools, List<Integer> visited, int version) {
@@ -559,7 +560,7 @@ public class SWFInputStream extends InputStream {
                         ins.setIgnored(true);
                     }
                     if ((!aif.ignoreUsed) && aif.jumpUsed) {
-                        ActionJump jmpIns = new ActionJump(aif.offset);
+                        ActionJump jmpIns = new ActionJump(aif.getJumpOffset());
                         ((ActionJump) jmpIns).setAddress(aif.getAddress(), version);
                         code.set(ip, (ActionJump) jmpIns);
                     }
@@ -572,11 +573,11 @@ public class SWFInputStream extends InputStream {
                                     ((ActionPush) ig.item).ignoredParts.add(ig.pos);
 
                                     if (((ActionPush) ig.item).ignoredParts.size() == ((ActionPush) ig.item).values.size()) {
-                                        ((Action) ig.item).ignored = true;
+                                        ((Action) ig.item).setIgnored(true);
                                     }
                                 }
                             } else {
-                                ((Action) ig.item).ignored = true;
+                                ((Action) ig.item).setIgnored(true);
                             }
                         }
                     }
@@ -589,7 +590,7 @@ public class SWFInputStream extends InputStream {
                         }
                     }
                     stack.pop();
-                    getConstantPool(cpool, localData, stack, output, code, condition ? (code.adr2pos(((ActionIf) ins).getAddress() + ((ActionIf) ins).getBytes(code.version).length + ((ActionIf) ins).offset)) : ip + 1, ip, constantPools, visited, version);
+                    getConstantPool(cpool, localData, stack, output, code, condition ? (code.adr2pos(((ActionIf) ins).getAddress() + ((ActionIf) ins).getBytes(code.version).length + ((ActionIf) ins).getJumpOffset())) : ip + 1, ip, constantPools, visited, version);
                 } else {
                     if (ins instanceof ActionIf) {
                         stack.pop();
@@ -634,7 +635,7 @@ public class SWFInputStream extends InputStream {
      * @return List of actions
      * @throws IOException
      */
-    public static List<Action> readActionList(ReReadableInputStream rri, int version, int ip) throws IOException {
+    public static List<Action> readActionList(long address, long containerSWFOffset, ReReadableInputStream rri, int version, int ip, int endip) throws IOException {
         List<Action> retdups = new ArrayList<Action>();
         ConstantPool cpool = new ConstantPool();
 
@@ -652,7 +653,7 @@ public class SWFInputStream extends InputStream {
          method = 2;
          goesPrev = readActionListAtPos(true, localData, stack, cpool, sis, rri, ip, retdups, ip);
          }*/
-        goesPrev = readActionListAtPos(false, true, localData, stack, cpool, sis, rri, ip, retdups, ip);
+        goesPrev = readActionListAtPos(address, containerSWFOffset, false, true, localData, stack, cpool, sis, rri, ip, retdups, ip, endip);
 
         if (goesPrev) {
         } else {
@@ -676,7 +677,7 @@ public class SWFInputStream extends InputStream {
             if (a instanceof ActionEnd) {
                 if (i < retdups.size() - 1) {
                     ActionJump jmp = new ActionJump(0);
-                    jmp.offset = retdups.size() - i - jmp.getBytes(version).length;
+                    jmp.setJumpOffset(retdups.size() - i - jmp.getBytes(version).length);
                     a.replaceWith = jmp;
                 }
             }
@@ -699,16 +700,18 @@ public class SWFInputStream extends InputStream {
         String s = null;
         //Action.setConstantPool(ret, cpool);
 
-        try {
-            s = Highlighting.stripHilights(Action.actionsToString(ret, null, version, false));
-            ret = ASMParser.parse(false, new ByteArrayInputStream(s.getBytes()), SWF.DEFAULT_VERSION);
-        } catch (ParseException ex) {
-            Logger.getLogger(SWFInputStream.class.getName()).log(Level.SEVERE, "parsing error", ex);
-        }
+        /* try {
+         s = Highlighting.stripHilights(Action.actionsToString(address,ret, null, version, false,containerSWFOffset));
+         //System.out.println("PARSE:"+s);
+         Helper.writeFile("t.txt", s.getBytes());
+         ret = ASMParser.parse(address,containerSWFOffset,false, new ByteArrayInputStream(s.getBytes()), SWF.DEFAULT_VERSION);
+         } catch (ParseException ex) {
+         Logger.getLogger(SWFInputStream.class.getName()).log(Level.SEVERE, "parsing error", ex);
+         }*/
         return ret;
     }
 
-    private static boolean readActionListAtPos(boolean notCompileTime, boolean enableVariables, List localData, Stack<GraphTargetItem> stack, ConstantPool cpool, SWFInputStream sis, ReReadableInputStream rri, int ip, List<Action> ret, int startIp) throws IOException {
+    private static boolean readActionListAtPos(long address, long containerSWFOffset, boolean notCompileTime, boolean enableVariables, List localData, Stack<GraphTargetItem> stack, ConstantPool cpool, SWFInputStream sis, ReReadableInputStream rri, int ip, List<Action> ret, int startIp, int endip) throws IOException {
         boolean debugMode = false;
         boolean decideBranch = false;
         boolean retv = false;
@@ -718,12 +721,21 @@ public class SWFInputStream extends InputStream {
         long filePos = rri.getPos();
         Scanner sc = new Scanner(System.in);
         int prevIp = ip;
-        while ((a = sis.readAction()) != null) {
+        while (((endip == -1) || (endip > ip)) && (a = sis.readAction(rri)) != null) {
             if ((ip < ret.size()) && (!(ret.get(ip) instanceof ActionNop))) {
                 a = ret.get(ip);
             }
-            a.setAddress(prevIp, SWF.DEFAULT_VERSION);
+            a.containerSWFOffset = containerSWFOffset;
+            a.setAddress(prevIp, SWF.DEFAULT_VERSION, false);
             int info = a.actionLength + 1 + ((a.actionCode > 0x80) ? 2 : 0);
+            byte b[] = a.getBytes(sis.version);
+            int infoCorrect = info;
+            if (a instanceof ActionContainer) {
+                infoCorrect += ((ActionContainer) a).getDataLength();
+            }
+            if (b.length != infoCorrect) {
+                //throw new RuntimeException("Wrong length "+a.toString()+" info:"+infoCorrect+" actual:"+b.length+" datalen:"+(infoCorrect-info));
+            }
             int actual = 0;
             if (a instanceof ActionContainer) {
                 actual = ((ActionContainer) a).getHeaderBytes().length;
@@ -742,10 +754,24 @@ public class SWFInputStream extends InputStream {
                 retv = true;
             }
             if (debugMode) {
-                //if(a instanceof ActionIf){
-                System.out.println("readActionListAtPos ip: " + (ip - startIp) + " action(len " + a.actionLength + "): " + a + (a.isIgnored() ? " (ignored)" : "") + " stack:" + Highlighting.stripHilights(stack.toString()) + " " + Helper.byteArrToString(a.getBytes(SWF.DEFAULT_VERSION)));
+                //if(a instanceof ActionIf){                
+                String atos = a.getASMSource(new ArrayList<Long>(), cpool.constants, sis.version, false);
+                if (a instanceof ActionContainer) {
+                    atos = a.toString();
+                }
+                System.err.println("readActionListAtPos ip: " + (ip - startIp) + " (0x" + Helper.formatAddress(ip - startIp) + ") " + " action(len " + a.actionLength + "): " + atos + (a.isIgnored() ? " (ignored)" : "") + " stack:" + Helper.stackToString(stack, Helper.toList(cpool)) + " " + Helper.byteArrToString(a.getBytes(SWF.DEFAULT_VERSION)));
                 //}
+                String add = "";
+                if (a instanceof ActionIf) {
+                    add = " change: " + ((ActionIf) a).getJumpOffset();
+                }
+                if (a instanceof ActionJump) {
+                    add = " change: " + ((ActionJump) a).getJumpOffset();
+                }
+                System.err.println(add);
             }
+
+
             /*if(a instanceof ActionConstantPool){
              throw new IllegalArgumentException("CP found");
              }     */
@@ -792,14 +818,14 @@ public class SWFInputStream extends InputStream {
                         GraphTargetItem top = null;
                         top = stack.pop();
 
-                        int nip = rri.getPos() + aif.offset;
+                        int nip = rri.getPos() + aif.getJumpOffset();
 
                         if (decideBranch) {
                             System.out.print("newip " + nip + ", ");
                             System.out.print("Action: jump(j),ignore(i),compute(c)?");
                             String next = sc.next();
                             if (next.equals("j")) {
-                                newip = rri.getPos() + aif.offset;
+                                newip = rri.getPos() + aif.getJumpOffset();
                                 rri.setPos(newip);
 
                             } else if (next.equals("i")) {
@@ -816,10 +842,10 @@ public class SWFInputStream extends InputStream {
                                 System.out.print("is compiletime -> ");
                             }
                             if (top.toBoolean()) {
-                                newip = rri.getPos() + aif.offset;
+                                newip = rri.getPos() + aif.getJumpOffset();
                                 //rri.setPos(newip);
                                 if (((!enableVariables) || (!top.isVariableComputed())) && (!aif.ignoreUsed)) {
-                                    a = new ActionJump(aif.offset);
+                                    a = new ActionJump(aif.getJumpOffset());
                                     a.setAddress(aif.getAddress(), SWF.DEFAULT_VERSION);
                                 }
                                 aif.jumpUsed = true;
@@ -854,11 +880,11 @@ public class SWFInputStream extends InputStream {
                                             ((ActionPush) ig.item).ignoredParts.add(ig.pos);
 
                                             if (((ActionPush) ig.item).ignoredParts.size() == ((ActionPush) ig.item).values.size()) {
-                                                ((Action) ig.item).ignored = true;
+                                                ((Action) ig.item).setIgnored(true);
                                             }
                                         }
                                     } else {
-                                        ((Action) ig.item).ignored = true;
+                                        ((Action) ig.item).setIgnored(true);
                                     }
                                 }
                             }
@@ -871,7 +897,7 @@ public class SWFInputStream extends InputStream {
                             goaif = true;
                         }
                     } else if (a instanceof ActionJump) {
-                        newip = rri.getPos() + ((ActionJump) a).offset;
+                        newip = rri.getPos() + ((ActionJump) a).getJumpOffset();
                         //if(newip>=0){
                         //rri.setPos(newip);
                         //}
@@ -932,7 +958,7 @@ public class SWFInputStream extends InputStream {
                 aif.jumpUsed = true;
                 int oldPos = rri.getPos();
                 Stack<GraphTargetItem> substack = (Stack<GraphTargetItem>) stack.clone();
-                if (readActionListAtPos(true, enableVariables, localData, substack, cpool, sis, rri, rri.getPos() + aif.offset, ret, startIp)) {
+                if (readActionListAtPos(address, containerSWFOffset, true, enableVariables, localData, substack, cpool, sis, rri, rri.getPos() + aif.getJumpOffset(), ret, startIp, endip)) {
                     retv = true;
                 }
                 rri.setPos(oldPos);
@@ -1281,13 +1307,17 @@ public class SWFInputStream extends InputStream {
         return ret;
     }
 
+    public Action readAction() throws IOException {
+        return readAction(new ReReadableInputStream(this));
+    }
+
     /**
      * Reads one Action from the stream
      *
      * @return Action or null when ActionEndFlag or end of the stream
      * @throws IOException
      */
-    public Action readAction() throws IOException {
+    public Action readAction(ReReadableInputStream rri) throws IOException {
         {
             int actionCode = readUI8();
             if (actionCode == 0) {
@@ -1415,7 +1445,7 @@ public class SWFInputStream extends InputStream {
                 case 0x88:
                     return new ActionConstantPool(actionLength, this, version);
                 case 0x9B:
-                    return new ActionDefineFunction(actionLength, this, version);
+                    return new ActionDefineFunction(actionLength, this, rri, version);
                 case 0x3C:
                     return new ActionDefineLocal();
                 case 0x41:
@@ -1443,7 +1473,7 @@ public class SWFInputStream extends InputStream {
                 case 0x45:
                     return new ActionTargetPath();
                 case 0x94:
-                    return new ActionWith(this, version);
+                    return new ActionWith(this, rri, version);
                 case 0x4A:
                     return new ActionToNumber();
                 case 0x4B:
@@ -1493,7 +1523,7 @@ public class SWFInputStream extends InputStream {
                     return new ActionStringGreater();
                 //SWF7 Actions
                 case 0x8E:
-                    return new ActionDefineFunction2(actionLength, this, version);
+                    return new ActionDefineFunction2(actionLength, this, rri, version);
                 case 0x69:
                     return new ActionExtends();
                 case 0x2B:
@@ -1501,7 +1531,7 @@ public class SWFInputStream extends InputStream {
                 case 0x2C:
                     return new ActionImplementsOp();
                 case 0x8F:
-                    return new ActionTry(actionLength, this, version);
+                    return new ActionTry(actionLength, this, rri, version);
                 case 0x2A:
                     return new ActionThrow();
                 default:
@@ -1643,17 +1673,10 @@ public class SWFInputStream extends InputStream {
      * @throws IOException
      */
     public CLIPACTIONRECORD readCLIPACTIONRECORD() throws IOException {
-        CLIPACTIONRECORD ret = new CLIPACTIONRECORD();
-        ret.eventFlags = readCLIPEVENTFLAGS();
+        CLIPACTIONRECORD ret = new CLIPACTIONRECORD(this, version, getPos());
         if (ret.eventFlags.isClear()) {
             return null;
         }
-        long actionRecordSize = readUI32();
-        if (ret.eventFlags.clipEventKeyPress) {
-            ret.keyCode = readUI8();
-            actionRecordSize--;
-        }
-        ret.actionBytes = readBytes(actionRecordSize);
         //ret.actions = (new SWFInputStream(new ByteArrayInputStream(readBytes(actionRecordSize)), version)).readActionList();
         return ret;
     }
@@ -2030,24 +2053,7 @@ public class SWFInputStream extends InputStream {
      * @throws IOException
      */
     public BUTTONCONDACTION readBUTTONCONDACTION() throws IOException {
-        BUTTONCONDACTION ret = new BUTTONCONDACTION();
-        int condActionSize = readUI16();
-        ret.isLast = condActionSize <= 0;
-        ret.condIdleToOverDown = readUB(1) == 1;
-        ret.condOutDownToIdle = readUB(1) == 1;
-        ret.condOutDownToOverDown = readUB(1) == 1;
-        ret.condOverDownToOutDown = readUB(1) == 1;
-        ret.condOverDownToOverUp = readUB(1) == 1;
-        ret.condOverUpToOverDown = readUB(1) == 1;
-        ret.condOverUpToIddle = readUB(1) == 1;
-        ret.condIdleToOverUp = readUB(1) == 1;
-        ret.condKeyPress = (int) readUB(7);
-        ret.condOverDownToIddle = readUB(1) == 1;
-        if (condActionSize <= 0) {
-            ret.actionBytes = readBytes(available());
-        } else {
-            ret.actionBytes = readBytes(condActionSize - 4);
-        }
+        BUTTONCONDACTION ret = new BUTTONCONDACTION(this, version, getPos());
         //ret.actions = readActionList();
         return ret;
     }
diff --git a/trunk/src/com/jpexs/decompiler/flash/SWFOutputStream.java b/trunk/src/com/jpexs/decompiler/flash/SWFOutputStream.java
index 47d6d836f..6da44b4a3 100644
--- a/trunk/src/com/jpexs/decompiler/flash/SWFOutputStream.java
+++ b/trunk/src/com/jpexs/decompiler/flash/SWFOutputStream.java
@@ -986,8 +986,6 @@ public class SWFOutputStream extends OutputStream {
      * @throws IOException
      */
     public void writeBUTTONCONDACTION(BUTTONCONDACTION value, boolean isLast) throws IOException {
-        BUTTONCONDACTION ret = new BUTTONCONDACTION();
-
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         SWFOutputStream sos = new SWFOutputStream(baos, version);
         sos.writeUB(1, value.condIdleToOverDown ? 1 : 0);
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/Action.java b/trunk/src/com/jpexs/decompiler/flash/action/Action.java
index 42c7390ff..c96ed42d5 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/Action.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/Action.java
@@ -54,7 +54,7 @@ public class Action implements GraphSourceItem {
     public Action beforeInsert;
     public Action afterInsert;
     public Action replaceWith;
-    public boolean ignored = false;
+    private boolean ignored = false;
     /**
      * Action type identifier
      */
@@ -63,7 +63,12 @@ public class Action implements GraphSourceItem {
      * Length of action data
      */
     public int actionLength;
+    public long containerSWFOffset;
     private long address;
+
+    public long getFileAddress() {
+        return containerSWFOffset + getAddress();
+    }
     /**
      * Names of ActionScript properties
      */
@@ -161,17 +166,17 @@ public class Action implements GraphSourceItem {
         List<Long> ret = new ArrayList<Long>();
         for (Action a : list) {
             if (a.replaceWith != null) {
-                a.replaceWith.setAddress(a.getAddress(), version);
+                a.replaceWith.setAddress(a.getAddress(), version, false);
                 ret.addAll(a.replaceWith.getAllRefs(version));
             }
             if (a.beforeInsert != null) {
-                a.beforeInsert.setAddress(a.getAddress(), version);
+                a.beforeInsert.setAddress(a.getAddress(), version, false);
                 ret.addAll(a.beforeInsert.getAllRefs(version));
             }
             List<Long> part = a.getAllRefs(version);
             ret.addAll(part);
             if (a.afterInsert != null) {
-                a.afterInsert.setAddress(a.getAddress(), version);
+                a.afterInsert.setAddress(a.getAddress(), version, false);
                 ret.addAll(a.afterInsert.getAllRefs(version));
             }
         }
@@ -184,7 +189,11 @@ public class Action implements GraphSourceItem {
      * @param address Address
      * @param version SWF version
      */
-    public void setAddress(long address, int version) {
+    public final void setAddress(long address, int version) {
+        setAddress(address, version, true);
+    }
+
+    public void setAddress(long address, int version, boolean recursive) {
         this.address = address;
     }
 
@@ -354,8 +363,8 @@ public class Action implements GraphSourceItem {
      * @param hex Add hexadecimal?
      * @return ASM source as String
      */
-    public static String actionsToString(List<Action> list, List<Long> importantOffsets, int version, boolean hex) {
-        return actionsToString(list, importantOffsets, new ArrayList<String>(), version, hex);
+    public static String actionsToString(long address, List<Action> list, List<Long> importantOffsets, int version, boolean hex, long swfPos) {
+        return actionsToString(address, list, importantOffsets, new ArrayList<String>(), version, hex, swfPos);
     }
 
     /**
@@ -368,7 +377,7 @@ public class Action implements GraphSourceItem {
      * @param hex Add hexadecimal?
      * @return ASM source as String
      */
-    public static String actionsToString(List<Action> list, List<Long> importantOffsets, List<String> constantPool, int version, boolean hex) {
+    public static String actionsToString(long address, List<Action> list, List<Long> importantOffsets, List<String> constantPool, int version, boolean hex, long swfPos) {
         String ret = "";
         long offset;
         if (importantOffsets == null) {
@@ -376,10 +385,12 @@ public class Action implements GraphSourceItem {
             importantOffsets = getActionsAllRefs(list, version);
         }
 
-        offset = 0;
+        offset = address;
+        int pos = -1;
         for (Action a : list) {
+            pos++;
             if (hex) {
-                ret += "<ffdec:hex>" + Helper.bytesToHexString((a instanceof ActionContainer) ? ((ActionContainer) a).getHeaderBytes() : a.getBytes(version)) + "</ffdec:hex>\r\n";
+                ret += "<ffdec:hex>" +/*"0x"+Helper.formatAddress(a.getFileAddress())+": "+*/ Helper.bytesToHexString((a instanceof ActionContainer) ? ((ActionContainer) a).getHeaderBytes() : a.getBytes(version)) + "</ffdec:hex>\r\n";
             }
             offset = a.getAddress();
             if (importantOffsets.contains(offset)) {
@@ -389,7 +400,12 @@ public class Action implements GraphSourceItem {
             if (a.replaceWith != null) {
                 ret += Highlighting.hilighOffset("", offset) + a.replaceWith.getASMSource(importantOffsets, constantPool, version, hex) + "\r\n";
             } else if (a.ignored) {
-                int len = a.getBytes(version).length;
+                int len = 0;
+                if (pos + 1 < list.size()) {
+                    len = (int) (list.get(pos + 1).getAddress() - a.getAddress());
+                } else {
+                    len = a.getBytes(version).length;
+                }
                 for (int i = 0; i < len; i++) {
                     ret += "Nop\r\n";
                 }
@@ -398,9 +414,16 @@ public class Action implements GraphSourceItem {
                     ret += a.beforeInsert.getASMSource(importantOffsets, constantPool, version, hex) + "\r\n";
                 }
                 //if (!(a instanceof ActionNop)) {
-                ret += Highlighting.hilighOffset("", offset) + a.getASMSourceReplaced(importantOffsets, constantPool, version, hex) + (a.ignored ? "; ignored" : "") + "\r\n";
-
-                //}
+                /*String add="";
+                 if(a instanceof ActionIf){
+                 add = " change: "+((ActionIf)a).getJumpOffset();
+                 }
+                 if(a instanceof ActionJump){
+                 add = " change: "+((ActionJump)a).getJumpOffset();
+                 }*/
+                 ret += Highlighting.hilighOffset("", offset) + a.getASMSourceReplaced(importantOffsets, constantPool, version, hex) + (a.ignored ? "; ignored" : "")+/*"; ofs"+Helper.formatAddress(offset)+add +*/ "\r\n";
+                  
+                        //}
                 if (a.afterInsert != null) {
                     ret += a.afterInsert.getASMSource(importantOffsets, constantPool, version, hex) + "\r\n";
                 }
@@ -649,6 +672,10 @@ public class Action implements GraphSourceItem {
                 break;
             }
             Action action = actions.get(ip);
+            if (action.isIgnored()) {
+                ip++;
+                continue;
+            }
             //System.out.println(" ip "+ip+" "+action);
             //return in for..in
             if ((action instanceof ActionPush) && (((ActionPush) action).values.size() == 1) && (((ActionPush) action).values.get(0) instanceof Null)) {
@@ -657,7 +684,7 @@ public class Action implements GraphSourceItem {
                         if (actions.get(ip + 2) instanceof ActionNot) {
                             if (actions.get(ip + 3) instanceof ActionIf) {
                                 ActionIf aif = (ActionIf) actions.get(ip + 3);
-                                if (adr2ip(actions, ip2adr(actions, ip + 4, version) + aif.offset, version) == ip) {
+                                if (adr2ip(actions, ip2adr(actions, ip + 4, version) + aif.getJumpOffset(), version) == ip) {
                                     ip += 4;
                                     continue;
                                 }
@@ -897,6 +924,21 @@ public class Action implements GraphSourceItem {
                                                                 break;
                                                             }
                                                             pos++;
+                                                        } else if (((StoreRegisterTreeItem) parts.get(pos)).value instanceof NewObjectTreeItem) {
+                                                            if (parts.get(pos + 1) instanceof SetMemberTreeItem) {
+                                                                if (((SetMemberTreeItem) parts.get(pos + 1)).value == ((StoreRegisterTreeItem) parts.get(pos)).value) {
+                                                                    instanceReg = ((StoreRegisterTreeItem) parts.get(pos)).register.number;
+                                                                    NewObjectTreeItem nm = (NewObjectTreeItem) ((StoreRegisterTreeItem) parts.get(pos)).value;
+                                                                    extendsOp = new GetVariableTreeItem(null, nm.objectName);
+                                                                } else {
+                                                                    ok = false;
+                                                                    break;
+                                                                }
+                                                            } else {
+                                                                ok = false;
+                                                                break;
+                                                            }
+                                                            pos++;
                                                         } else {
                                                             ok = false;
                                                             break;
@@ -1037,12 +1079,12 @@ public class Action implements GraphSourceItem {
         return false;
     }
 
-    public static List<Action> removeNops(List<Action> actions, int version) {
+    public static List<Action> removeNops(long address, List<Action> actions, int version, long swfPos) {
         List<Action> ret = actions;
         String s = null;
         try {
-            s = Highlighting.stripHilights(Action.actionsToString(ret, null, version, false));
-            ret = ASMParser.parse(true, new ByteArrayInputStream(s.getBytes()), SWF.DEFAULT_VERSION);
+            s = Highlighting.stripHilights(Action.actionsToString(address, ret, null, version, false, swfPos));
+            ret = ASMParser.parse(address, swfPos, true, new ByteArrayInputStream(s.getBytes()), SWF.DEFAULT_VERSION);
         } catch (Exception ex) {
             Logger.getLogger(SWFInputStream.class.getName()).log(Level.SEVERE, "parsing error", ex);
         }
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java
index 01ae0b418..b368feb52 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java
@@ -311,641 +311,6 @@ public class ActionGraph extends Graph {
         }
         return ret;
     }
-    /*
-     private TreeItem translatePartGetStack(GraphPart part, Stack<TreeItem> stack, HashMap<Integer, String> registerNames) {
-     stack = (Stack<TreeItem>) stack.clone();
-     translatePart(part, stack, registerNames);
-     return stack.pop();
-     }
-
-     private List<TreeItem> translatePart(GraphPart part, Stack<TreeItem> stack, HashMap<Integer, String> registerNames) {
-     List<GraphPart> sub = part.getSubParts();
-     List<TreeItem> ret = new ArrayList<TreeItem>();
-     int end = 0;
-     for (GraphPart p : sub) {
-     if (p.end == -1) {
-     p.end = code.size() - 1;
-     }
-     if (p.start == code.size()) {
-     continue;
-     } else if (p.end == code.size()) {
-     p.end--;
-     }
-     end = p.end;
-     int start = p.start;
-     if (code.get(end) instanceof ActionJump) {
-     end--;
-     } else if (code.get(end) instanceof ActionIf) {
-     end--;
-     }
-     ret.addAll(Action.actionsPartToTree(registerNames, stack, code, start, end, version));
-     }
-     return ret;
-     }
-
-     private TreeItem checkLoop(GraphPart part, GraphPart stopPart, List<Loop> loops) {
-     if (part == stopPart) {
-     return null;
-     }
-     for (Loop l : loops) {
-     if (l.loopContinue == part) {
-     return (new ContinueTreeItem(null, l.loopBreak == null ? -1 : l.loopBreak.start));
-     }
-     if (l.loopBreak == part) {
-     return (new BreakTreeItem(null, part.start));
-     }
-     }
-     return null;
-     }
-     private boolean doDecompile = true;
-
-     private List<TreeItem> printGraph(HashMap<Integer, String> registerNames, Stack<TreeItem> stack, List<GraphPart> allParts, GraphPart parent, GraphPart part, GraphPart stopPart, List<Loop> loops, HashMap<Loop, List<TreeItem>> forFinalCommands) {
-     List<TreeItem> ret = new ArrayList<TreeItem>();
-     boolean debugMode = false;
-     if (part.start >= code.size()) {
-     return ret;
-     }
-
-     if (!doDecompile) {
-     // ret.add(new CommentTreeItem(null, "not decompiled"));
-     return ret;
-     }
-
-     if (debugMode) {
-     System.err.println("PART " + part);
-     }
-
-     if (part == stopPart) {
-     return ret;
-     }
-     if (part.ignored) {
-     return ret;
-     }
-     List<String> fqn = new ArrayList<String>();
-     HashMap<Integer, String> lrn = new HashMap<Integer, String>();
-     List<TreeItem> output = new ArrayList<TreeItem>();
-     boolean isSwitch = false;
-     List<GraphPart> parts = new ArrayList<GraphPart>();
-     if (part instanceof GraphPartMulti) {
-     parts = ((GraphPartMulti) part).parts;
-     } else {
-     parts.add(part);
-     }
-     boolean isIf = false;
-     int end = part.end;
-     if (end == -1) {
-     end = code.size() - 1;
-     }
-     if (end == code.size()) {
-     end--;
-     }
-     output.addAll(translatePart(part, stack, registerNames));
-     if (end > -1) {
-     if (code.get(end) instanceof ActionJump) {
-     end--;
-     } else if (code.get(end) instanceof ActionIf) {
-     end--;
-     isIf = true;
-     }
-     }
-     if (isIf) {
-     Action ins = code.get(end + 1);
-     if ((stack.size() >= 2) && (stack.get(stack.size() - 1) instanceof NotTreeItem) && (((NotTreeItem) stack.get(stack.size() - 1)).value == stack.get(stack.size() - 2))) {
-     ret.addAll(output);
-     printGraph(registerNames, stack, allParts, parent, part.nextParts.get(1), part.nextParts.get(0), loops, forFinalCommands);
-     TreeItem second = stack.pop();
-     TreeItem first = stack.pop();
-     stack.push(new AndTreeItem(ins, first, second));
-     ret.addAll(printGraph(registerNames, stack, allParts, parent, part.nextParts.get(0), stopPart, loops, forFinalCommands));
-     return ret;
-     } else if ((stack.size() >= 2) && (stack.get(stack.size() - 1) == stack.get(stack.size() - 2))) {
-     ret.addAll(output);
-     printGraph(registerNames, stack, allParts, parent, part.nextParts.get(1), part.nextParts.get(0), loops, forFinalCommands);
-     TreeItem second = stack.pop();
-     TreeItem first = stack.pop();
-     stack.push(new OrTreeItem(ins, first, second));
-     ret.addAll(printGraph(registerNames, stack, allParts, parent, part.nextParts.get(0), stopPart, loops, forFinalCommands));
-     return ret;
-     } else if (stack.peek() instanceof StrictEqTreeItem) {
-
-     TreeItem switchedObject = null;
-     if (!output.isEmpty()) {
-     if (output.get(output.size() - 1) instanceof StoreRegisterTreeItem) {
-     switchedObject = ((StoreRegisterTreeItem) output.get(output.size() - 1)).value;
-     }
-     }
-     if (switchedObject == null) {
-     switchedObject = new DirectValueTreeItem(null, -1, new Null(), null);
-     }
-     HashMap<Integer, TreeItem> caseValuesMap = new HashMap<Integer, TreeItem>();
-
-     int pos = 0;
-     StrictEqTreeItem set = (StrictEqTreeItem) stack.pop();
-     caseValuesMap.put(pos, set.rightSide);
-
-     //GraphPart switchLoc = part.nextParts.get(1).nextParts.get(0);
-     List<GraphPart> caseBodyParts = new ArrayList<GraphPart>();
-     caseBodyParts.add(part.nextParts.get(0));
-     TreeItem top = null;
-     int cnt = 1;
-     while (part.nextParts.size() > 1
-     && part.nextParts.get(1).getHeight() > 1
-     && code.get(part.nextParts.get(1).end) instanceof ActionIf
-     && ((top = translatePartGetStack(part.nextParts.get(1), stack, registerNames)) instanceof StrictEqTreeItem)) {
-     cnt++;
-     part = part.nextParts.get(1);
-     pos++;
-     caseBodyParts.add(part.nextParts.get(0));
-               
-     set = (StrictEqTreeItem) top;
-     caseValuesMap.put(pos, set.rightSide);
-     }
-     if (cnt == 1) {
-     stack.push(set);
-     } else {
-     part = part.nextParts.get(1);
-
-     GraphPart defaultPart = part;
-     //caseBodyParts.add(defaultPart);
-
-
-
-     List<GraphPart> defaultAndLastPart = new ArrayList<GraphPart>();
-     defaultAndLastPart.add(defaultPart);
-     defaultAndLastPart.add(caseBodyParts.get(caseBodyParts.size() - 1));
-
-     GraphPart defaultPart2 = getCommonPart(defaultAndLastPart);
-
-     List<TreeItem> defaultCommands = new ArrayList<TreeItem>();
-
-     defaultCommands = printGraph(registerNames, stack, allParts, null, defaultPart, defaultPart2, loops, forFinalCommands);
-
-
-     List<GraphPart> loopContinues = new ArrayList<GraphPart>();
-     for (Loop l : loops) {
-     if (l.loopContinue != null) {
-     loopContinues.add(l.loopContinue);
-     }
-     }
-
-     List<GraphPart> breakParts = new ArrayList<GraphPart>();
-     for (int g = 0; g < caseBodyParts.size(); g++) {
-     if (g < caseBodyParts.size() - 1) {
-     if (caseBodyParts.get(g).leadsTo(caseBodyParts.get(g + 1), loopContinues)) {
-     continue;
-     }
-     }
-     GraphPart nsp = caseBodyParts.get(g).getNextSuperPartPath(loopContinues);
-     if (nsp != null) {
-     breakParts.add(nsp);
-     }
-     }
-     Collections.sort(breakParts, new Comparator<GraphPart>() {
-     @Override
-     public int compare(GraphPart o1, GraphPart o2) {
-     return o2.path.length() - o1.path.length();
-     }
-     });
-
-     GraphPart breakPart = breakParts.isEmpty() ? null : breakParts.get(0);
-     if ((defaultPart2 != breakPart) && (defaultCommands.isEmpty())) {
-     defaultPart = defaultPart2;
-     }
-
-
-     List<TreeItem> caseValues = new ArrayList<TreeItem>();
-     for (int i = 0; i < caseBodyParts.size(); i++) {
-     if (caseValuesMap.containsKey(i)) {
-     caseValues.add(caseValuesMap.get(i));
-     } else {
-     continue;
-     }
-     }
-
-     List<List<TreeItem>> caseCommands = new ArrayList<List<TreeItem>>();
-     GraphPart next = null;
-
-
-
-     next = breakPart;
-
-     TreeItem ti = checkLoop(next, stopPart, loops);
-     loops.add(new Loop(null, next));
-     //switchLoc.getNextPartPath(new ArrayList<GraphPart>());
-     List<Integer> valuesMapping = new ArrayList<Integer>();
-     List<GraphPart> caseBodies = new ArrayList<GraphPart>();
-     for (int i = 0; i < caseValues.size(); i++) {
-     GraphPart cur = caseBodyParts.get(i);
-     if (!caseBodies.contains(cur)) {
-     caseBodies.add(cur);
-     }
-     valuesMapping.add(caseBodies.indexOf(cur));
-     }
-
-
-
-
-     if (defaultPart == breakPart) {
-     defaultPart = null;
-     }
-     if ((defaultPart != null) && (defaultCommands.isEmpty())) {
-     defaultCommands = printGraph(registerNames, stack, allParts, null, defaultPart, next, loops, forFinalCommands);
-     }
-
-     List<GraphPart> ignored = new ArrayList<GraphPart>();
-     for (Loop l : loops) {
-     ignored.add(l.loopContinue);
-     }
-
-     for (int i = 0; i < caseBodies.size(); i++) {
-     List<TreeItem> cc = new ArrayList<TreeItem>();
-     GraphPart nextCase = null;
-     nextCase = next;
-     if (next != null) {
-     if (i < caseBodies.size() - 1) {
-     if (!caseBodies.get(i).leadsTo(caseBodies.get(i + 1), ignored)) {
-     cc.add(new BreakTreeItem(null, next.start));
-     } else {
-     nextCase = caseBodies.get(i + 1);
-     }
-     } else if (!defaultCommands.isEmpty()) {
-     if (!caseBodies.get(i).leadsTo(defaultPart, ignored)) {
-     cc.add(new BreakTreeItem(null, next.start));
-     } else {
-     nextCase = defaultPart;
-     }
-     }
-     }
-     cc.addAll(0, printGraph(registerNames, stack, allParts, null, caseBodies.get(i), nextCase, loops, forFinalCommands));
-     if (cc.size() >= 2) {
-     if (cc.get(cc.size() - 1) instanceof BreakTreeItem) {
-     if ((cc.get(cc.size() - 2) instanceof ContinueTreeItem) || (cc.get(cc.size() - 2) instanceof BreakTreeItem)) {
-     cc.remove(cc.size() - 1);
-     }
-     }
-     }
-     caseCommands.add(cc);
-     }
-
-     SwitchTreeItem sti = new SwitchTreeItem(null, next == null ? -1 : next.start, switchedObject, caseValues, caseCommands, defaultCommands, valuesMapping);
-     ret.add(sti);
-
-     if (next != null) {
-     if (ti != null) {
-     ret.add(ti);
-     } else {
-     ret.addAll(printGraph(registerNames, stack, allParts, null, next, stopPart, loops, forFinalCommands));
-     }
-     }
-     return ret;
-     }
-     } else {
-     //ins.translate
-     }
-     //((IfTypeIns)ins.definition).translateInverted(new HashMap<Integer,TreeItem>(), co.stack, ins);
-     }
-
-     int ip = part.start;
-     List<GraphPart> loopContinues = new ArrayList<GraphPart>();
-     for (Loop l : loops) {
-     if (l.loopContinue != null) {
-     loopContinues.add(l.loopContinue);
-     }
-     }
-     boolean loop = false;
-     boolean reversed = false;
-     if ((!part.nextParts.isEmpty()) && part.nextParts.get(0).leadsTo(part, loopContinues)) {
-     loop = true;
-     } else if ((part.nextParts.size() > 1) && part.nextParts.get(1).leadsTo(part, loopContinues)) {
-     loop = true;
-     reversed = true;
-     }
-     if (((part.nextParts.size() == 2) || ((part.nextParts.size() == 1) && loop)) && (!isSwitch)) {
-
-     boolean doWhile = loop;
-     if (loop && output.isEmpty()) {
-     doWhile = false;
-     }
-     Loop currentLoop = new Loop(part, null);
-     if (loop) {
-     loops.add(currentLoop);
-     }
-
-
-
-     loopContinues = new ArrayList<GraphPart>();
-     for (Loop l : loops) {
-     if (l.loopContinue != null) {
-     loopContinues.add(l.loopContinue);
-     }
-     }
-
-     if (part.nextParts.size() > 1) {
-     currentLoop.loopBreak = part.nextParts.get(reversed ? 0 : 1);
-     }
-
-     forFinalCommands.put(currentLoop, new ArrayList<TreeItem>());
-
-     int breakIp = -1;
-     if (currentLoop.loopBreak != null) {
-     breakIp = currentLoop.loopBreak.start;
-     }
-     TreeItem expr = null;
-     if ((code.get(part.end) instanceof ActionJump) || (!(code.get(part.end) instanceof ActionIf))) {
-     expr = new DirectValueTreeItem(null, -1, (Boolean) true, new ArrayList<String>());
-     } else {
-     if (stack.isEmpty()) {
-     }
-     expr = stack.pop();
-     }
-     if (doWhile) {
-     ret.add(new DoWhileTreeItem(null, breakIp, part.start, output, expr));
-     } else {
-     ret.addAll(output);
-     }
-
-     GraphPart next = part.getNextPartPath(loopContinues);
-
-     if (loop && (!doWhile)) {
-
-     if (reversed && (expr instanceof LogicalOp)) {
-     expr = ((LogicalOp) expr).invert();
-     }
-     List<TreeItem> loopBody = null;
-     List<TreeItem> finalCommands = null;
-     GraphPart finalPart = null;
-     loopBody = printGraph(registerNames, stack, allParts, part, part.nextParts.get(reversed ? 1 : 0), stopPart, loops, forFinalCommands);
-
-     finalCommands = forFinalCommands.get(currentLoop);
-     if (!finalCommands.isEmpty()) {
-     ret.add(new ForTreeItem(null, breakIp, currentLoop.loopContinue.start, new ArrayList<TreeItem>(), expr, finalCommands, loopBody));
-     } else {
-     ret.add(new WhileTreeItem(null, breakIp, part.start, expr, loopBody));
-     }
-     } else if (!loop) {
-     if (expr instanceof LogicalOp) {
-     expr = ((LogicalOp) expr).invert();
-     } else {
-     expr = new NotTreeItem(null, expr);
-     }
-
-     int stackSizeBefore = stack.size();
-     Stack<TreeItem> trueStack = (Stack<TreeItem>) stack.clone();
-     Stack<TreeItem> falseStack = (Stack<TreeItem>) stack.clone();
-     TreeItem lopTrue = checkLoop(part.nextParts.get(1), stopPart, loops);
-     TreeItem lopFalse = null;
-     if (next != part.nextParts.get(0)) {
-     lopFalse = checkLoop(part.nextParts.get(0), stopPart, loops);
-     }
-     List<TreeItem> onTrue = new ArrayList<TreeItem>();
-     if (lopTrue != null) {
-     onTrue.add(lopTrue);
-     } else {
-     if (debugMode) {
-     System.err.println("ONTRUE: (inside " + part + ")");
-     }
-     onTrue = printGraph(registerNames, trueStack, allParts, part, part.nextParts.get(1), next == null ? stopPart : next, loops, forFinalCommands);
-     if (debugMode) {
-     System.err.println("/ONTRUE (inside " + part + ")");
-     }
-     }
-     List<TreeItem> onFalse = new ArrayList<TreeItem>();
-     if (lopFalse != null) {
-     onFalse.add(lopFalse);
-     } else {
-     if (debugMode) {
-     System.err.println("ONFALSE: (inside " + part + ")");
-     }
-     onFalse = (((next == part.nextParts.get(0)) || (part.nextParts.get(0).path.equals(part.path) || part.nextParts.get(0).path.length() < part.path.length())) ? new ArrayList<TreeItem>() : printGraph(registerNames, falseStack, allParts, part, part.nextParts.get(0), next == null ? stopPart : next, loops, forFinalCommands));
-     if (debugMode) {
-     System.err.println("/ONFALSE (inside " + part + ")");
-     }
-     }
-
-     if (onTrue.isEmpty() && onFalse.isEmpty() && (trueStack.size() > stackSizeBefore) && (falseStack.size() > stackSizeBefore)) {
-     stack.push(new TernarOpTreeItem(null, expr, trueStack.pop(), falseStack.pop()));
-     } else {
-     ret.add(new IfTreeItem(null, expr, onTrue, onFalse));
-
-     //Same continues in onTrue and onFalse gets continue on parent level
-     if ((!onTrue.isEmpty()) && (!onFalse.isEmpty())) {
-     if (onTrue.get(onTrue.size() - 1) instanceof ContinueTreeItem) {
-     if (onFalse.get(onFalse.size() - 1) instanceof ContinueTreeItem) {
-     if (((ContinueTreeItem) onTrue.get(onTrue.size() - 1)).loopPos == ((ContinueTreeItem) onFalse.get(onFalse.size() - 1)).loopPos) {
-     onTrue.remove(onTrue.size() - 1);
-     ret.add(onFalse.remove(onFalse.size() - 1));
-     }
-     }
-     }
-     }
-     }
-     }
-     if (loop && (part.nextParts.size() > 1)) {
-     loops.remove(currentLoop); //remove loop so no break shows up
-     ret.addAll(printGraph(registerNames, stack, allParts, part, part.nextParts.get(reversed ? 0 : 1), stopPart, loops, forFinalCommands));
-     }
-
-     if (next != null) {
-     TreeItem ti = checkLoop(next, stopPart, loops);
-     if (ti != null) {
-     ret.add(ti);
-     } else {
-     if (debugMode) {
-     System.err.println("NEXT: (inside " + part + ")");
-     }
-     ret.addAll(printGraph(registerNames, stack, allParts, part, next, stopPart, loops, forFinalCommands));
-     if (debugMode) {
-     System.err.println("/NEXT: (inside " + part + ")");
-     }
-     }
-
-     }
-     } else {
-     ret.addAll(output);
-     }
-     onepart:
-     if (part.nextParts.size() == 1 && (!loop)) {
-
-
-     GraphPart p = part.nextParts.get(0);
-     TreeItem lop = checkLoop(p, stopPart, loops);
-     if (lop == null) {
-     if (p.path.length() == part.path.length()) {
-     ret.addAll(printGraph(registerNames, stack, allParts, part, p, stopPart, loops, forFinalCommands));
-     } else {
-     if ((p != stopPart) && (p.refs.size() > 1)) {
-     List<GraphPart> nextList = new ArrayList<GraphPart>();
-     populateParts(p, nextList);
-     Loop nearestLoop = null;
-     loopn:
-     for (GraphPart n : nextList) {
-     for (Loop l : loops) {
-     if (l.loopContinue == n) {
-     nearestLoop = l;
-     break loopn;
-     }
-     }
-     }
-     if ((nearestLoop != null) && (nearestLoop.loopBreak != null)) {
-     List<TreeItem> finalCommands = printGraph(registerNames, stack, allParts, part, p, nearestLoop.loopContinue, loops, forFinalCommands);
-     nearestLoop.loopContinue = p;
-     forFinalCommands.put(nearestLoop, finalCommands);
-     ContinueTreeItem cti = new ContinueTreeItem(null, nearestLoop.loopBreak.start);
-     ret.add(cti);
-     }
-     }
-     }
-     } else {
-     ret.add(lop);
-     }
-     }
-     return ret;
-     }
-     private List<Integer> posCache;
-
-     private void buildCache() {
-     posCache = new ArrayList<Integer>();
-     int pos = 0;
-     for (int i = 0; i < code.size(); i++) {
-     posCache.add(pos);
-     pos += code.get(i).getBytes(version).length;
-     }
-     posCache.add(pos);
-     }
-
-     private int pos2adr(int pos) {
-     if (posCache == null) {
-     buildCache();
-     }
-     return posCache.get(pos);
-     }
-
-     private int adr2pos(int adr) {
-     if (posCache == null) {
-     buildCache();
-     }
-     return posCache.indexOf(adr);
-     }
-
-     private void visitCode(int ip, int lastIp, HashMap<Integer, List<Integer>> refs) {
-     while (ip < code.size()) {
-     refs.get(ip).add(lastIp);
-     lastIp = ip;
-     if (refs.get(ip).size() > 1) {
-     break;
-     }
-     Action ins = code.get(ip);
-     if (ins instanceof ActionThrow) {
-     break;
-     }
-     if (ins instanceof ActionReturn) {
-     break;
-     }
-
-     if (ins instanceof ActionJump) {
-     ip = adr2pos(pos2adr(ip) + ins.getBytes(version).length + ((ActionJump) ins).offset);
-     continue;
-     } else if (ins instanceof ActionIf) {
-     visitCode(adr2pos(pos2adr(ip) + ins.getBytes(version).length + ((ActionIf) ins).offset), ip, refs);
-     }
-     ip++;
-     };
-     }
-
-     public HashMap<Integer, List<Integer>> visitCode() {
-     HashMap<Integer, List<Integer>> refs = new HashMap<Integer, List<Integer>>();
-     for (int i = 0; i < code.size(); i++) {
-     refs.put(i, new ArrayList<Integer>());
-     }
-     visitCode(0, 0, refs);
-     return refs;
-     }
-
-     private List<GraphPart> makeGraph(List<Action> actions, List<GraphPart> allBlocks) {
-     HashMap<Integer, List<Integer>> refs = visitCode();
-     List<GraphPart> ret = new ArrayList<GraphPart>();
-     boolean visited[] = new boolean[code.size()];
-     ret.add(makeGraph(null, "0", code, 0, 0, allBlocks, refs, visited));
-     return ret;
-     }
-
-     private GraphPart makeGraph(GraphPart parent, String path, List<Action> code, int startip, int lastIp, List<GraphPart> allBlocks, HashMap<Integer, List<Integer>> refs, boolean visited2[]) {
-
-     int ip = startip;
-     for (GraphPart p : allBlocks) {
-     if (p.start == ip) {
-     p.refs.add(parent);
-     return p;
-     }
-     }
-     GraphPart g;
-     GraphPart ret = new GraphPart(ip, -1);
-     ret.path = path;
-     GraphPart part = ret;
-     while (ip < code.size()) {
-     if (visited2[ip] || ((ip != startip) && (refs.get(ip).size() > 1))) {
-     part.end = lastIp;
-     GraphPart found = null;
-     for (GraphPart p : allBlocks) {
-     if (p.start == ip) {
-     found = p;
-     break;
-     }
-     }
-
-     allBlocks.add(part);
-
-     if (found != null) {
-     part.nextParts.add(found);
-     found.refs.add(part);
-     break;
-     } else {
-     GraphPart gp = new GraphPart(ip, -1);
-     gp.path = path;
-     part.nextParts.add(gp);
-     gp.refs.add(part);
-     part = gp;
-     }
-     }
-     lastIp = ip;
-     Action ins = code.get(ip);
-     if ((ins instanceof ActionThrow) || (ins instanceof ActionReturn)) {
-     part.end = ip;
-     allBlocks.add(part);
-     break;
-     }
-     if (ins instanceof ActionJump) {
-     part.end = ip;
-     allBlocks.add(part);
-     int newip = adr2pos(pos2adr(ip) + ins.getBytes(version).length + ((ActionJump) ins).offset);
-     part.nextParts.add(g = makeGraph(part, path, code, newip, lastIp, allBlocks, refs, visited2));
-     g.refs.add(part);
-     break;
-     } else if (ins instanceof ActionIf) {
-     part.end = ip;
-     allBlocks.add(part);
-     part.nextParts.add(g = makeGraph(part, path + "0", code, adr2pos(pos2adr(ip) + ins.getBytes(version).length + ((ActionIf) ins).offset), ip, allBlocks, refs, visited2));
-     g.refs.add(part);
-     part.nextParts.add(g = makeGraph(part, path + "1", code, ip + 1, ip, allBlocks, refs, visited2));
-     g.refs.add(part);
-
-     break;
-     }
-     ip++;
-     };
-     if (ip == code.size()) {
-     allBlocks.add(part);
-     if (part.start == ip) {
-     part.end = ip;
-     } else {
-     part.end = code.size() - 1;
-     part.nextParts.add(makeGraph(part, path, code, ip, ip, allBlocks, refs, visited2));
-     }
-
-     }
-     return ret;
-     }
-     */
 
     @Override
     protected int checkIp(int ip) {
@@ -958,7 +323,7 @@ public class ActionGraph extends Graph {
                     if (code.get(ip + 2) instanceof ActionNot) {
                         if (code.get(ip + 3) instanceof ActionIf) {
                             ActionIf aif = (ActionIf) code.get(ip + 3);
-                            if (code.adr2pos(code.pos2adr(ip + 4) + aif.offset) == ip) {
+                            if (code.adr2pos(code.pos2adr(ip + 4) + aif.getJumpOffset()) == ip) {
                                 ip += 4;
                             }
                         }
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java
index d89fbc0e0..f272020f3 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java
@@ -69,6 +69,7 @@ public class ActionGraphSource extends GraphSource {
         if (adr == 0) {
             return 0;
         }
+        //throw new RuntimeException("Address "+Helper.formatAddress(adr)+" not found");
         return -1;
     }
 
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/gui/ActionPanel.java b/trunk/src/com/jpexs/decompiler/flash/action/gui/ActionPanel.java
index bf5da6af2..b0767a63c 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/gui/ActionPanel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/gui/ActionPanel.java
@@ -115,7 +115,7 @@ public class ActionPanel extends JPanel implements ActionListener {
                 if (Main.DO_DECOMPILE) {
                     List<com.jpexs.decompiler.flash.action.Action> as = asm.getActions(SWF.DEFAULT_VERSION);
                     lastCode = as;
-                    com.jpexs.decompiler.flash.action.Action.setActionsAddresses(as, 0, SWF.DEFAULT_VERSION);
+                    //com.jpexs.decompiler.flash.action.Action.setActionsAddresses(as, 0, SWF.DEFAULT_VERSION);
                     String s = com.jpexs.decompiler.flash.action.Action.actionsToSource(as, SWF.DEFAULT_VERSION);
                     decompiledHilights = Highlighting.getInstrHighlights(s);
                     decompiledEditor.setText(Highlighting.stripHilights(s));
@@ -316,7 +316,7 @@ public class ActionPanel extends JPanel implements ActionListener {
             setHex(hexButton.isSelected());
         } else if (e.getActionCommand().equals("SAVEACTION")) {
             try {
-                src.setActions(ASMParser.parse(true, new ByteArrayInputStream(editor.getText().getBytes()), SWF.DEFAULT_VERSION), SWF.DEFAULT_VERSION);
+                src.setActions(ASMParser.parse(0, src.getPos(), true, new ByteArrayInputStream(editor.getText().getBytes()), SWF.DEFAULT_VERSION), SWF.DEFAULT_VERSION);
                 setSource(this.src);
                 JOptionPane.showMessageDialog(this, "Code successfully saved");
             } catch (IOException ex) {
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/parser/ASMParser.java b/trunk/src/com/jpexs/decompiler/flash/action/parser/ASMParser.java
index 541a1907c..cd98d7203 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/parser/ASMParser.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/parser/ASMParser.java
@@ -25,14 +25,17 @@ import com.jpexs.decompiler.flash.action.swf4.*;
 import com.jpexs.decompiler.flash.action.swf5.*;
 import com.jpexs.decompiler.flash.action.swf6.*;
 import com.jpexs.decompiler.flash.action.swf7.*;
+import com.jpexs.decompiler.flash.helpers.Helper;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class ASMParser {
 
-    public static List<Action> parse(boolean ignoreNops, List<Label> labels, long address, FlasmLexer lexer, List<String> constantPool, int version) throws IOException, ParseException {
+    public static List<Action> parse(long containerSWFOffset, boolean ignoreNops, List<Label> labels, long address, FlasmLexer lexer, List<String> constantPool, int version) throws IOException, ParseException {
         List<Action> list = new ArrayList<Action>();
         while (true) {
             ParsedSymbol symb = lexer.yylex();
@@ -179,7 +182,7 @@ public class ASMParser {
                 } else if (instructionName.equals("Decrement".toLowerCase())) {
                     list.add(new ActionDecrement());
                 } else if (instructionName.equals("DefineFunction".toLowerCase())) {
-                    list.add(new ActionDefineFunction(ignoreNops, labels, address, lexer, constantPool, version));
+                    list.add(new ActionDefineFunction(containerSWFOffset + address, ignoreNops, labels, address, lexer, constantPool, version));
                 } else if (instructionName.equals("DefineLocal".toLowerCase())) {
                     list.add(new ActionDefineLocal());
                 } else if (instructionName.equals("DefineLocal2".toLowerCase())) {
@@ -227,7 +230,7 @@ public class ASMParser {
                 } else if (instructionName.equals("TypeOf".toLowerCase())) {
                     list.add(new ActionTypeOf());
                 } else if (instructionName.equals("With".toLowerCase())) {
-                    list.add(new ActionWith(ignoreNops, labels, address, lexer, constantPool, version));
+                    list.add(new ActionWith(containerSWFOffset + address, ignoreNops, labels, address, lexer, constantPool, version));
                 } else if (instructionName.equals("Enumerate2".toLowerCase())) {
                     list.add(new ActionEnumerate2());
                 } else if (instructionName.equals("Greater".toLowerCase())) {
@@ -241,7 +244,7 @@ public class ASMParser {
                 } else if (instructionName.equals("CastOp".toLowerCase())) {
                     list.add(new ActionCastOp());
                 } else if (instructionName.equals("DefineFunction2".toLowerCase())) {
-                    list.add(new ActionDefineFunction2(ignoreNops, labels, address, lexer, constantPool, version));
+                    list.add(new ActionDefineFunction2(containerSWFOffset + address, ignoreNops, labels, address, lexer, constantPool, version));
                 } else if (instructionName.equals("Extends".toLowerCase())) {
                     list.add(new ActionExtends());
                 } else if (instructionName.equals("ImplementsOp".toLowerCase())) {
@@ -249,7 +252,7 @@ public class ASMParser {
                 } else if (instructionName.equals("Throw".toLowerCase())) {
                     list.add(new ActionThrow());
                 } else if (instructionName.equals("Try".toLowerCase())) {
-                    list.add(new ActionTry(ignoreNops, labels, address, lexer, constantPool, version));
+                    list.add(new ActionTry(containerSWFOffset + address, ignoreNops, labels, address, lexer, constantPool, version));
                 } else if (instructionName.equals("FSCommand2".toLowerCase())) {
                     list.add(new ActionFSCommand2());
                 } else if (instructionName.equals("StrictMode".toLowerCase())) {
@@ -258,14 +261,20 @@ public class ASMParser {
                     if (!ignoreNops) {
                         list.add(new ActionNop());
                     }
-                } else {
+                }/* else if(instructionName.startsWith("ofs")) {
+                 continue;
+                 }*/ else {
                     throw new ParseException("Unknown instruction name :" + instructionName, lexer.yyline());
                 }
                 if (instructionName.equals("Nop".toLowerCase())) {
                     if (!ignoreNops) {
+                        (list.get(list.size() - 1)).containerSWFOffset = containerSWFOffset;
+                        (list.get(list.size() - 1)).setAddress(address, version, false);
                         address += 1;
                     }
                 } else {
+                    (list.get(list.size() - 1)).containerSWFOffset = containerSWFOffset;
+                    (list.get(list.size() - 1)).setAddress(address, version, false);
                     address += (list.get(list.size() - 1)).getBytes(version).length;
                 }
             } else if (symb.type == ParsedSymbol.TYPE_EOL) {
@@ -277,20 +286,22 @@ public class ASMParser {
         }
     }
 
-    public static List<Action> parse(boolean ignoreNops, InputStream is, int version) throws IOException, ParseException {
+    public static List<Action> parse(long address, long containerSWFOffset, boolean ignoreNops, InputStream is, int version) throws IOException, ParseException {
         FlasmLexer lexer = new FlasmLexer(is);
         List<Label> labels = new ArrayList<Label>();
-        List<Action> ret = parse(ignoreNops, labels, 0, lexer, new ArrayList<String>(), version);
+        List<Action> ret = parse(containerSWFOffset, ignoreNops, labels, address, lexer, new ArrayList<String>(), version);
         List<Action> links = Action.getActionsAllIfsOrJumps(ret);
-        Action.setActionsAddresses(ret, 0, version);
+        //Action.setActionsAddresses(ret, address, version);
         for (Action link : links) {
             boolean found = false;
             String identifier = null;
             if (link instanceof ActionJump) {
                 identifier = ((ActionJump) link).identifier;
+
                 for (Label label : labels) {
+
                     if (((ActionJump) link).identifier.equals(label.name)) {
-                        ((ActionJump) link).offset = (int) (label.address - (((ActionJump) link).getAddress() + ((ActionJump) link).getBytes(version).length));
+                        ((ActionJump) link).setJumpOffset((int) (label.address - (((ActionJump) link).getAddress() + ((ActionJump) link).getBytes(version).length)));
                         found = true;
                         break;
                     }
@@ -298,9 +309,10 @@ public class ASMParser {
             }
             if (link instanceof ActionIf) {
                 identifier = ((ActionIf) link).identifier;
+
                 for (Label label : labels) {
                     if (((ActionIf) link).identifier.equals(label.name)) {
-                        ((ActionIf) link).offset = (int) (label.address - (((ActionIf) link).getAddress() + ((ActionIf) link).getBytes(version).length));
+                        ((ActionIf) link).setJumpOffset((int) (label.address - (((ActionIf) link).getAddress() + ((ActionIf) link).getBytes(version).length)));
                         found = true;
                         break;
                     }
@@ -308,7 +320,7 @@ public class ASMParser {
             }
             if ((link instanceof ActionJump) || (link instanceof ActionIf)) {
                 if (!found) {
-                    //System.err.println("TARGET NOT FOUND - identifier:" + identifier+" addr: ofs"+Helper.formatAddress(link.getAddress()));
+                    Logger.getLogger(ASMParser.class.getName()).log(Level.SEVERE, "TARGET NOT FOUND - identifier:" + identifier + " addr: ofs" + Helper.formatAddress(link.getAddress()));
                 }
             }
         }
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/special/ActionContainer.java b/trunk/src/com/jpexs/decompiler/flash/action/special/ActionContainer.java
index 181b8724a..239f38c25 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/special/ActionContainer.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/special/ActionContainer.java
@@ -12,4 +12,6 @@ public interface ActionContainer {
     public byte[] getHeaderBytes();
 
     public List<Action> getActions();
+
+    public int getDataLength();
 }
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/special/ActionEnd.java b/trunk/src/com/jpexs/decompiler/flash/action/special/ActionEnd.java
index cb02b8bb1..3034f4aab 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/special/ActionEnd.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/special/ActionEnd.java
@@ -26,7 +26,7 @@ public class ActionEnd extends Action {
 
     public ActionEnd() {
         super(0, 0);
-        ignored = true;
+        setIgnored(true);
     }
 
     @Override
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java
index 11f27c321..6f5848c51 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java
@@ -28,18 +28,28 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class ActionIf extends Action {
 
-    public int offset;
+    private int offset;
     public String identifier;
     public boolean compileTime;
     public boolean jumpUsed = false;
     public boolean ignoreUsed = false;
 
+    public int getJumpOffset() {
+        return offset;
+    }
+
+    public final void setJumpOffset(int offset) {
+        this.offset = offset;
+    }
+
     public ActionIf(SWFInputStream sis) throws IOException {
         super(0x9D, 2);
-        offset = sis.readSI16();
+        setJumpOffset(sis.readSI16());
     }
 
     @Override
@@ -96,8 +106,15 @@ public class ActionIf extends Action {
     @Override
     public List<Integer> getBranches(GraphSource code) {
         List<Integer> ret = super.getBranches(code);
-        ret.add(code.adr2pos(getAddress() + getBytes(((ActionGraphSource) code).version).length + offset));
-        ret.add(code.adr2pos(getAddress() + getBytes(((ActionGraphSource) code).version).length));
+        int jmp = code.adr2pos(getAddress() + getBytes(((ActionGraphSource) code).version).length + offset);
+        int after = code.adr2pos(getAddress() + getBytes(((ActionGraphSource) code).version).length);
+        if (jmp == -1) {
+            Logger.getLogger(ActionIf.class.getName()).log(Level.SEVERE, "Invalid IF jump to ofs" + Helper.formatAddress(getAddress() + getBytes(((ActionGraphSource) code).version).length + offset));
+            ret.add(after);
+        } else {
+            ret.add(jmp);
+        }
+        ret.add(after);
         return ret;
     }
 
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java
index 5bf314635..d5b405e39 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java
@@ -28,12 +28,22 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class ActionJump extends Action {
 
-    public int offset;
+    private int offset;
     public String identifier;
 
+    public int getJumpOffset() {
+        return offset;
+    }
+
+    public void setJumpOffset(int offset) {
+        this.offset = offset;
+    }
+
     public ActionJump(int offset) {
         super(0x99, 2);
         this.offset = offset;
@@ -98,7 +108,12 @@ public class ActionJump extends Action {
     @Override
     public List<Integer> getBranches(GraphSource code) {
         List<Integer> ret = super.getBranches(code);
-        ret.add(code.adr2pos(getAddress() + getBytes(((ActionGraphSource) code).version).length + offset));
+        int ofs = code.adr2pos(getAddress() + getBytes(((ActionGraphSource) code).version).length + offset);
+        if (ofs == -1) {
+            ofs = code.adr2pos(getAddress() + getBytes(((ActionGraphSource) code).version).length);
+            Logger.getLogger(ActionJump.class.getName()).log(Level.SEVERE, "Invalid jump to ofs" + Helper.formatAddress(getAddress() + getBytes(((ActionGraphSource) code).version).length + offset) + " from ofs" + Helper.formatAddress(getAddress()));
+        }
+        ret.add(ofs);
         return ret;
     }
 }
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java
index 4bcb2f9df..9bcf8057b 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java
@@ -175,6 +175,8 @@ public class ActionPush extends Action {
                     } else {
                         break loop;
                     }
+                case ParsedSymbol.TYPE_COMMENT:
+                    break;
                 default:
                     throw new ParseException("Arguments expected", lexer.yyline());
 
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java
index 7d4010bca..086e764b4 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java
@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.flash.action.swf5;
 
+import com.jpexs.decompiler.flash.ReReadableInputStream;
 import com.jpexs.decompiler.flash.SWFInputStream;
 import com.jpexs.decompiler.flash.SWFOutputStream;
 import com.jpexs.decompiler.flash.action.Action;
@@ -30,7 +31,6 @@ import com.jpexs.decompiler.flash.action.swf7.ActionDefineFunction2;
 import com.jpexs.decompiler.flash.action.treemodel.FunctionTreeItem;
 import com.jpexs.decompiler.flash.graph.GraphTargetItem;
 import com.jpexs.decompiler.flash.helpers.Helper;
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -48,6 +48,7 @@ public class ActionDefineFunction extends Action implements ActionContainer {
     public int codeSize;
     private int version;
     public List<String> constantPool;
+    private long hdrSize;
 
     @Override
     public List<Action> getActions() {
@@ -69,22 +70,27 @@ public class ActionDefineFunction extends Action implements ActionContainer {
         }
     }
 
-    public ActionDefineFunction(int actionLength, SWFInputStream sis, int version) throws IOException {
+    public ActionDefineFunction(int actionLength, SWFInputStream sis, ReReadableInputStream rri, int version) throws IOException {
         super(0x9B, actionLength);
         this.version = version;
         //byte data[]=sis.readBytes(actionLength);
         //sis=new SWFInputStream(new ByteArrayInputStream(data),version);
+        long startPos = sis.getPos();
         functionName = sis.readString();
         int numParams = sis.readUI16();
         for (int i = 0; i < numParams; i++) {
             paramNames.add(sis.readString());
         }
         codeSize = sis.readUI16();
+        long endPos = sis.getPos();
         //code = new ArrayList<Action>();
-        code = (new SWFInputStream(new ByteArrayInputStream(sis.readBytes(codeSize)), version)).readActionList();
+        hdrSize = endPos - startPos;
+        int posBef2 = rri.getPos();
+        code = sis.readActionList(rri.getPos(), getFileAddress() + hdrSize, rri, codeSize);
+        rri.setPos(posBef2 + codeSize);
     }
 
-    public ActionDefineFunction(boolean ignoreNops, List<Label> labels, long address, FlasmLexer lexer, List<String> constantPool, int version) throws IOException, ParseException {
+    public ActionDefineFunction(long containerSWFPos, boolean ignoreNops, List<Label> labels, long address, FlasmLexer lexer, List<String> constantPool, int version) throws IOException, ParseException {
         super(0x9B, -1);
         functionName = lexString(lexer);
         int numParams = (int) lexLong(lexer);
@@ -92,7 +98,27 @@ public class ActionDefineFunction extends Action implements ActionContainer {
             paramNames.add(lexString(lexer));
         }
         lexBlockOpen(lexer);
-        code = ASMParser.parse(ignoreNops, labels, address + getPreLen(version), lexer, constantPool, version);
+        code = ASMParser.parse(containerSWFPos + getHeaderLength(), ignoreNops, labels, address + getPreLen(version), lexer, constantPool, version);
+    }
+
+    public long getHeaderLength() {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        SWFOutputStream sos = new SWFOutputStream(baos, version);
+        ByteArrayOutputStream baos2 = new ByteArrayOutputStream();
+        try {
+            sos.writeString(functionName);
+            sos.writeUI16(paramNames.size());
+            for (String s : paramNames) {
+                sos.writeString(s);
+            }
+            sos.writeUI16(0);
+            sos.close();
+
+
+            baos2.write(surroundWithAction(baos.toByteArray(), version));
+        } catch (IOException e) {
+        }
+        return baos2.toByteArray().length;
     }
 
     @Override
@@ -158,9 +184,11 @@ public class ActionDefineFunction extends Action implements ActionContainer {
     }
 
     @Override
-    public void setAddress(long address, int version) {
-        super.setAddress(address, version);
-        Action.setActionsAddresses(code, address + getPreLen(version), version);
+    public void setAddress(long address, int version, boolean recursive) {
+        super.setAddress(address, version, recursive);
+        if (recursive) {
+            Action.setActionsAddresses(code, address + getPreLen(version), version);
+        }
     }
 
     @Override
@@ -170,7 +198,7 @@ public class ActionDefineFunction extends Action implements ActionContainer {
             paramStr += "\"" + Helper.escapeString(paramNames.get(i)) + "\"";
             paramStr += " ";
         }
-        return "DefineFunction \"" + Helper.escapeString(functionName) + "\" " + paramNames.size() + " " + paramStr + " {\r\n" + Action.actionsToString(code, knownAddreses, constantPool, version, hex) + "}";
+        return "DefineFunction \"" + Helper.escapeString(functionName) + "\" " + paramNames.size() + " " + paramStr + " {\r\n" + Action.actionsToString(getAddress() + getHeaderLength(), code, knownAddreses, constantPool, version, hex, getFileAddress() + hdrSize) + "}";
     }
 
     @Override
@@ -211,4 +239,9 @@ public class ActionDefineFunction extends Action implements ActionContainer {
     public String toString() {
         return "DefineFunction";
     }
+
+    @Override
+    public int getDataLength() {
+        return codeSize;
+    }
 }
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java
index 2b577b7fa..924a62ec9 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java
@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.flash.action.swf5;
 
+import com.jpexs.decompiler.flash.ReReadableInputStream;
 import com.jpexs.decompiler.flash.SWFInputStream;
 import com.jpexs.decompiler.flash.SWFOutputStream;
 import com.jpexs.decompiler.flash.action.Action;
@@ -40,24 +41,26 @@ public class ActionWith extends Action implements ActionContainer {
         return actions;
     }
 
-    public ActionWith(SWFInputStream sis, int version) throws IOException {
+    public ActionWith(SWFInputStream sis, ReReadableInputStream rri, int version) throws IOException {
         super(0x94, 2);
         size = sis.readUI16();
         this.version = version;
         //actions = new ArrayList<Action>();
-        actions = (new SWFInputStream(new ByteArrayInputStream(sis.readBytes(size)), version)).readActionList();
+        actions = (new SWFInputStream(new ByteArrayInputStream(sis.readBytes(size)), version)).readActionList(rri.getPos(), containerSWFOffset + getAddress() + 2, rri, size);
     }
 
-    public ActionWith(boolean ignoreNops, List<Label> labels, long address, FlasmLexer lexer, List<String> constantPool, int version) throws IOException, ParseException {
+    public ActionWith(long containerSWFPos, boolean ignoreNops, List<Label> labels, long address, FlasmLexer lexer, List<String> constantPool, int version) throws IOException, ParseException {
         super(0x94, 2);
         lexBlockOpen(lexer);
-        actions = ASMParser.parse(ignoreNops, labels, address + 5, lexer, constantPool, version);
+        actions = ASMParser.parse(containerSWFPos + 2, ignoreNops, labels, address + 5, lexer, constantPool, version);
     }
 
     @Override
-    public void setAddress(long address, int version) {
-        super.setAddress(address, version);
-        Action.setActionsAddresses(actions, address + 5, version);
+    public void setAddress(long address, int version, boolean recursive) {
+        super.setAddress(address, version, recursive);
+        if (recursive) {
+            Action.setActionsAddresses(actions, address + 5, version);
+        }
     }
 
     @Override
@@ -93,7 +96,7 @@ public class ActionWith extends Action implements ActionContainer {
 
     @Override
     public String getASMSource(List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
-        return "With {\r\n" + Action.actionsToString(actions, knownAddreses, constantPool, version, hex) + "}";
+        return "With {\r\n" + Action.actionsToString(getAddress() + 2, actions, knownAddreses, constantPool, version, hex, containerSWFOffset + getAddress() + 2) + "}";
     }
 
     @Override
@@ -105,4 +108,9 @@ public class ActionWith extends Action implements ActionContainer {
     public List<Action> getAllIfsOrJumps() {
         return Action.getActionsAllIfsOrJumps(actions);
     }
+
+    @Override
+    public int getDataLength() {
+        return size;
+    }
 }
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java
index dcfdbff7a..31a9b8e44 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java
@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.flash.action.swf7;
 
+import com.jpexs.decompiler.flash.ReReadableInputStream;
 import com.jpexs.decompiler.flash.SWFInputStream;
 import com.jpexs.decompiler.flash.SWFOutputStream;
 import com.jpexs.decompiler.flash.action.Action;
@@ -30,7 +31,6 @@ import com.jpexs.decompiler.flash.action.swf5.ActionDefineFunction;
 import com.jpexs.decompiler.flash.action.treemodel.FunctionTreeItem;
 import com.jpexs.decompiler.flash.graph.GraphTargetItem;
 import com.jpexs.decompiler.flash.helpers.Helper;
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -79,9 +79,11 @@ public class ActionDefineFunction2 extends Action implements ActionContainer {
             }
         }
     }
+    private long hdrSize;
 
-    public ActionDefineFunction2(int actionLength, SWFInputStream sis, int version) throws IOException {
+    public ActionDefineFunction2(int actionLength, SWFInputStream sis, ReReadableInputStream rri, int version) throws IOException {
         super(0x8E, actionLength);
+        long posBef = sis.getPos();
         this.version = version;
         functionName = sis.readString();
         int numParams = sis.readUI16();
@@ -101,12 +103,15 @@ public class ActionDefineFunction2 extends Action implements ActionContainer {
             paramNames.add(sis.readString());
         }
         codeSize = sis.readUI16();
-
+        long posAfter = sis.getPos();
+        hdrSize = posAfter - posBef;
         //code = new ArrayList<Action>();
-        code = (new SWFInputStream(new ByteArrayInputStream(sis.readBytes(codeSize)), version)).readActionList();
+        int posBef2 = rri.getPos();
+        code = sis.readActionList(rri.getPos(), getFileAddress() + hdrSize, rri, codeSize);
+        rri.setPos(posBef2 + codeSize);
     }
 
-    public ActionDefineFunction2(boolean ignoreNops, List<Label> labels, long address, FlasmLexer lexer, List<String> constantPool, int version) throws IOException, ParseException {
+    public ActionDefineFunction2(long containerSWFPos, boolean ignoreNops, List<Label> labels, long address, FlasmLexer lexer, List<String> constantPool, int version) throws IOException, ParseException {
         super(0x8E, -1);
         functionName = lexString(lexer);
         int numParams = (int) lexLong(lexer);
@@ -125,7 +130,38 @@ public class ActionDefineFunction2 extends Action implements ActionContainer {
             paramNames.add(lexString(lexer));
         }
         lexBlockOpen(lexer);
-        code = ASMParser.parse(ignoreNops, labels, address + getPreLen(version), lexer, constantPool, version);
+        code = ASMParser.parse(containerSWFPos + getHeaderLength(), ignoreNops, labels, address + getPreLen(version), lexer, constantPool, version);
+    }
+
+    public long getHeaderLength() {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        SWFOutputStream sos = new SWFOutputStream(baos, version);
+        ByteArrayOutputStream baos2 = new ByteArrayOutputStream();
+        try {
+            sos.writeString(functionName);
+            sos.writeUI16(paramNames.size());
+            sos.writeUI8(registerCount);
+            sos.writeUB(1, preloadParentFlag ? 1 : 0);
+            sos.writeUB(1, preloadRootFlag ? 1 : 0);
+            sos.writeUB(1, suppressSuperFlag ? 1 : 0);
+            sos.writeUB(1, preloadSuperFlag ? 1 : 0);
+            sos.writeUB(1, suppressArgumentsFlag ? 1 : 0);
+            sos.writeUB(1, preloadArgumentsFlag ? 1 : 0);
+            sos.writeUB(1, suppressThisFlag ? 1 : 0);
+            sos.writeUB(1, preloadThisFlag ? 1 : 0);
+            sos.writeUB(7, 0);
+            sos.writeUB(1, preloadGlobalFlag ? 1 : 0);
+            for (int i = 0; i < paramNames.size(); i++) {
+                sos.writeUI8(paramRegisters.get(i));
+
+                sos.writeString(paramNames.get(i));
+            }
+            sos.writeUI16(0);
+            sos.close();
+            baos2.write(surroundWithAction(baos.toByteArray(), version));
+        } catch (IOException e) {
+        }
+        return baos2.toByteArray().length;
     }
 
     @Override
@@ -149,6 +185,7 @@ public class ActionDefineFunction2 extends Action implements ActionContainer {
             sos.writeUB(1, preloadGlobalFlag ? 1 : 0);
             for (int i = 0; i < paramNames.size(); i++) {
                 sos.writeUI8(paramRegisters.get(i));
+
                 sos.writeString(paramNames.get(i));
             }
             byte codeBytes[] = Action.actionsToBytes(code, false, version);
@@ -227,9 +264,11 @@ public class ActionDefineFunction2 extends Action implements ActionContainer {
     }
 
     @Override
-    public void setAddress(long address, int version) {
-        super.setAddress(address, version);
-        Action.setActionsAddresses(code, address + getPreLen(version), version);
+    public void setAddress(long address, int version, boolean recursive) {
+        super.setAddress(address, version, recursive);
+        if (recursive) {
+            Action.setActionsAddresses(code, address + getPreLen(version), version);
+        }
     }
 
     @Override
@@ -266,7 +305,7 @@ public class ActionDefineFunction2 extends Action implements ActionContainer {
                 + " " + preloadArgumentsFlag
                 + " " + suppressThisFlag
                 + " " + preloadThisFlag
-                + " " + preloadGlobalFlag).trim() + " " + paramStr + " {\r\n" + Action.actionsToString(code, knownAddreses, constantPool, version, hex) + "}";
+                + " " + preloadGlobalFlag).trim() + " " + paramStr + " {\r\n" + Action.actionsToString(getAddress() + getHeaderLength(), code, knownAddreses, constantPool, version, hex, getFileAddress() + hdrSize) + "}";
     }
 
     @Override
@@ -347,4 +386,9 @@ public class ActionDefineFunction2 extends Action implements ActionContainer {
     public List<Action> getAllIfsOrJumps() {
         return Action.getActionsAllIfsOrJumps(code);
     }
+
+    @Override
+    public int getDataLength() {
+        return codeSize;
+    }
 }
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java
index 60752a07e..4185f0106 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java
@@ -16,13 +16,13 @@
  */
 package com.jpexs.decompiler.flash.action.swf7;
 
+import com.jpexs.decompiler.flash.ReReadableInputStream;
 import com.jpexs.decompiler.flash.SWFInputStream;
 import com.jpexs.decompiler.flash.SWFOutputStream;
 import com.jpexs.decompiler.flash.action.Action;
 import com.jpexs.decompiler.flash.action.parser.*;
 import com.jpexs.decompiler.flash.action.swf4.RegisterNumber;
 import com.jpexs.decompiler.flash.helpers.Helper;
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -38,9 +38,13 @@ public class ActionTry extends Action {
     public List<Action> tryBody;
     public List<Action> catchBody;
     public List<Action> finallyBody;
+    long tryPos;
+    long catchPos;
+    long finPos;
 
-    public ActionTry(int actionLength, SWFInputStream sis, int version) throws IOException {
+    public ActionTry(int actionLength, SWFInputStream sis, ReReadableInputStream rri, int version) throws IOException {
         super(0x8F, actionLength);
+        long startPos = sis.getPos();
         sis.readUB(5);
         catchInRegisterFlag = sis.readUB(1) == 1;
         finallyBlockFlag = sis.readUB(1) == 1;
@@ -53,42 +57,44 @@ public class ActionTry extends Action {
         } else {
             catchName = sis.readString();
         }
-        byte tryBodyBytes[] = sis.readBytes(trySize);
-        byte catchBodyBytes[] = sis.readBytes(catchSize);
-        byte finallyBodyBytes[] = sis.readBytes(finallySize);
-        tryBody = (new SWFInputStream(new ByteArrayInputStream(tryBodyBytes), version)).readActionList();
-        catchBody = (new SWFInputStream(new ByteArrayInputStream(catchBodyBytes), version)).readActionList();
-        finallyBody = (new SWFInputStream(new ByteArrayInputStream(finallyBodyBytes), version)).readActionList();
+        tryPos = sis.getPos() - startPos;
+        tryBody = sis.readActionList(rri.getPos(), getFileAddress() + tryPos, rri, trySize);
+        catchPos = sis.getPos() - startPos;
+        catchBody = sis.readActionList(rri.getPos(), getFileAddress() + catchPos, rri, catchSize);
+        finPos = sis.getPos() - startPos;
+        finallyBody = sis.readActionList(rri.getPos(), getFileAddress() + finPos, rri, finallySize);
     }
 
     @Override
-    public void setAddress(long address, int version) {
-        super.setAddress(address, version);
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        SWFOutputStream sos = new SWFOutputStream(baos, version);
-        try {
-            sos.writeUB(5, 0);
-            sos.writeUB(1, catchInRegisterFlag ? 1 : 0);
-            sos.writeUB(1, finallyBlockFlag ? 1 : 0);
-            sos.writeUB(1, catchBlockFlag ? 1 : 0);
-            byte tryBodyBytes[] = Action.actionsToBytes(tryBody, false, version);
-            byte catchBodyBytes[] = Action.actionsToBytes(catchBody, false, version);
-            byte finallyBodyBytes[] = Action.actionsToBytes(finallyBody, false, version);
-            sos.writeUI16(tryBodyBytes.length);
-            sos.writeUI16(catchBodyBytes.length);
-            sos.writeUI16(finallyBodyBytes.length);
-            if (catchInRegisterFlag) {
-                sos.writeUI8(catchRegister);
-            } else {
-                sos.writeString(catchName);
+    public void setAddress(long address, int version, boolean recursive) {
+        super.setAddress(address, version, recursive);
+        if (recursive) {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            SWFOutputStream sos = new SWFOutputStream(baos, version);
+            try {
+                sos.writeUB(5, 0);
+                sos.writeUB(1, catchInRegisterFlag ? 1 : 0);
+                sos.writeUB(1, finallyBlockFlag ? 1 : 0);
+                sos.writeUB(1, catchBlockFlag ? 1 : 0);
+                byte tryBodyBytes[] = Action.actionsToBytes(tryBody, false, version);
+                byte catchBodyBytes[] = Action.actionsToBytes(catchBody, false, version);
+                byte finallyBodyBytes[] = Action.actionsToBytes(finallyBody, false, version);
+                sos.writeUI16(tryBodyBytes.length);
+                sos.writeUI16(catchBodyBytes.length);
+                sos.writeUI16(finallyBodyBytes.length);
+                if (catchInRegisterFlag) {
+                    sos.writeUI8(catchRegister);
+                } else {
+                    sos.writeString(catchName);
+                }
+                Action.setActionsAddresses(tryBody, address + baos.toByteArray().length, version);
+                sos.write(tryBodyBytes);
+                Action.setActionsAddresses(catchBody, address + baos.toByteArray().length, version);
+                sos.write(catchBodyBytes);
+                Action.setActionsAddresses(finallyBody, address + baos.toByteArray().length, version);
+                sos.close();
+            } catch (IOException e) {
             }
-            Action.setActionsAddresses(tryBody, address + baos.toByteArray().length, version);
-            sos.write(tryBodyBytes);
-            Action.setActionsAddresses(catchBody, address + baos.toByteArray().length, version);
-            sos.write(catchBodyBytes);
-            Action.setActionsAddresses(finallyBody, address + baos.toByteArray().length, version);
-            sos.close();
-        } catch (IOException e) {
         }
     }
 
@@ -121,10 +127,10 @@ public class ActionTry extends Action {
         return surroundWithAction(baos.toByteArray(), version);
     }
 
-    public ActionTry(boolean ignoreNops, List<Label> labels, long address, FlasmLexer lexer, List<String> constantPool, int version) throws IOException, ParseException {
+    public ActionTry(long containerSWFPos, boolean ignoreNops, List<Label> labels, long address, FlasmLexer lexer, List<String> constantPool, int version) throws IOException, ParseException {
         super(0x8F, 0);
         lexBlockOpen(lexer);
-        tryBody = ASMParser.parse(ignoreNops, labels, address + 4 + 6, lexer, constantPool, version);
+        tryBody = ASMParser.parse(containerSWFPos/*TODO: FIX THIS!!!*/, ignoreNops, labels, address + 4 + 6, lexer, constantPool, version);
         ParsedSymbol symb = lexer.yylex();
         catchBlockFlag = false;
         if (symb.type == ParsedSymbol.TYPE_INSTRUCTION_NAME) {
@@ -141,14 +147,14 @@ public class ActionTry extends Action {
                     throw new ParseException("Catched name or register expected", lexer.yyline());
                 }
                 lexBlockOpen(lexer);
-                catchBody = ASMParser.parse(ignoreNops, labels, address + 4 + 6 + Action.actionsToBytes(tryBody, false, version).length, lexer, constantPool, version);
+                catchBody = ASMParser.parse(containerSWFPos/*TODO: FIX THIS!!!*/, ignoreNops, labels, address + 4 + 6 + Action.actionsToBytes(tryBody, false, version).length, lexer, constantPool, version);
                 symb = lexer.yylex();
             }
             if (symb.type == ParsedSymbol.TYPE_INSTRUCTION_NAME) {
                 if (((String) symb.value).toLowerCase().equals("finally")) {
                     finallyBlockFlag = true;
                     lexBlockOpen(lexer);
-                    finallyBody = ASMParser.parse(ignoreNops, labels, address + 4 + 6 + Action.actionsToBytes(tryBody, false, version).length + Action.actionsToBytes(catchBody, false, version).length, lexer, constantPool, version);
+                    finallyBody = ASMParser.parse(containerSWFPos/*TODO: FIX THIS!!!*/, ignoreNops, labels, address + 4 + 6 + Action.actionsToBytes(tryBody, false, version).length + Action.actionsToBytes(catchBody, false, version).length, lexer, constantPool, version);
                 } else {
                     finallyBlockFlag = false;
                     lexer.yypushback(lexer.yylength());
@@ -166,7 +172,7 @@ public class ActionTry extends Action {
     public String getASMSource(List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
         String ret = "";
         ret += "Try {";
-        ret += Action.actionsToString(tryBody, knownAddreses, constantPool, version, hex);
+        ret += Action.actionsToString(getAddress() + tryPos, tryBody, knownAddreses, constantPool, version, hex, getFileAddress() + tryPos);
         ret += "}";
         if (catchBlockFlag) {
             ret += "\r\nCatch ";
@@ -176,12 +182,12 @@ public class ActionTry extends Action {
                 ret += "\"" + Helper.escapeString(catchName) + "\"";
             }
             ret += " {\r\n";
-            ret += Action.actionsToString(catchBody, knownAddreses, constantPool, version, hex);
+            ret += Action.actionsToString(getAddress() + catchPos, catchBody, knownAddreses, constantPool, version, hex, getFileAddress() + catchPos);
             ret += "}";
         }
         if (finallyBlockFlag) {
             ret += "\r\nFinally {\r\n";
-            ret += Action.actionsToString(finallyBody, knownAddreses, constantPool, version, hex);
+            ret += Action.actionsToString(getAddress() + finPos, finallyBody, knownAddreses, constantPool, version, hex, getFileAddress() + finPos);
             ret += "}";
         }
         return ret;
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallFunctionTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallFunctionTreeItem.java
index 25c48f362..41700072c 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallFunctionTreeItem.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallFunctionTreeItem.java
@@ -39,7 +39,7 @@ public class CallFunctionTreeItem extends TreeItem {
             if (t > 0) {
                 paramStr += hilight(",");
             }
-            paramStr += arguments.get(t).toString(constants);
+            paramStr += arguments.get(t).toStringNL(constants);
         }
         return stripQuotes(functionName) + hilight("(") + paramStr + hilight(")");
     }
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallMethodTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallMethodTreeItem.java
index 2cb6823fa..850d908a2 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallMethodTreeItem.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallMethodTreeItem.java
@@ -41,7 +41,7 @@ public class CallMethodTreeItem extends TreeItem {
             if (t > 0) {
                 paramStr += hilight(",");
             }
-            paramStr += arguments.get(t).toString(constants);
+            paramStr += arguments.get(t).toStringNL(constants);
         }
         boolean blankMethod = false;
         if (methodName instanceof DirectValueTreeItem) {
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/FunctionTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/FunctionTreeItem.java
index e55c0965a..f02b9a20c 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/FunctionTreeItem.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/FunctionTreeItem.java
@@ -110,4 +110,9 @@ public class FunctionTreeItem extends TreeItem {
         }
         return 0;
     }
+
+    @Override
+    public boolean needsNewLine() {
+        return true;
+    }
 }
diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java b/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java
index 38cfa3f59..5f8cf21ec 100644
--- a/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java
+++ b/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java
@@ -1314,6 +1314,10 @@ public class Graph {
             ip = checkIp(ip);
             lastIp = ip;
             GraphSourceItem ins = code.get(ip);
+            if (ins.isIgnored()) {
+                ip++;
+                continue;
+            }
             if (ins.isExit()) {
                 part.end = ip;
                 allBlocks.add(part);
diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/GraphSource.java b/trunk/src/com/jpexs/decompiler/flash/graph/GraphSource.java
index 8893f9288..d7c62ad58 100644
--- a/trunk/src/com/jpexs/decompiler/flash/graph/GraphSource.java
+++ b/trunk/src/com/jpexs/decompiler/flash/graph/GraphSource.java
@@ -20,6 +20,7 @@ public abstract class GraphSource {
     public abstract List<GraphTargetItem> translatePart(List localData, Stack<GraphTargetItem> stack, int start, int end);
 
     private void visitCode(int ip, int lastIp, HashMap<Integer, List<Integer>> refs) {
+        boolean debugMode = false;
         while (ip < size()) {
             refs.get(ip).add(lastIp);
             lastIp = ip;
@@ -28,7 +29,13 @@ public abstract class GraphSource {
             }
             GraphSourceItem ins = get(ip);
 
-
+            if (ins.isIgnored()) {
+                ip++;
+                continue;
+            }
+            if (debugMode) {
+                System.err.println("visit ip " + ip + " action:" + ins);
+            }
             if (ins.isExit()) {
                 break;
             }
diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/GraphTargetItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/GraphTargetItem.java
index fc8c9dd45..479097701 100644
--- a/trunk/src/com/jpexs/decompiler/flash/graph/GraphTargetItem.java
+++ b/trunk/src/com/jpexs/decompiler/flash/graph/GraphTargetItem.java
@@ -121,4 +121,16 @@ public abstract class GraphTargetItem {
     public GraphTargetItem getThroughRegister() {
         return this;
     }
+
+    public boolean needsNewLine() {
+        return false;
+    }
+
+    public String toStringNL(Object... localData) {
+        List localData2 = new ArrayList();
+        for (Object o : localData) {
+            localData2.add(o);
+        }
+        return toString(localData2) + (needsNewLine() ? "\r\n" : "");
+    }
 }
diff --git a/trunk/src/com/jpexs/decompiler/flash/helpers/Helper.java b/trunk/src/com/jpexs/decompiler/flash/helpers/Helper.java
index 3a877c2ec..60c76f095 100644
--- a/trunk/src/com/jpexs/decompiler/flash/helpers/Helper.java
+++ b/trunk/src/com/jpexs/decompiler/flash/helpers/Helper.java
@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.flash.helpers;
 
+import com.jpexs.decompiler.flash.graph.GraphTargetItem;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.FileInputStream;
@@ -25,6 +26,7 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Stack;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -332,4 +334,16 @@ public class Helper {
     public static String hexToComments(String str) {
         return str.replaceAll("<ffdec:hex>([^\r\n]*)</ffdec:hex>(\r?\n)", "; $1$2");
     }
+
+    public static String stackToString(Stack<GraphTargetItem> stack, List localData) {
+        String ret = "[";
+        for (int i = stack.size() - 1; i >= 0; i--) {
+            if (i < stack.size() - 1) {
+                ret += ", ";
+            }
+            ret += stack.get(i).toString(localData);
+        }
+        ret += "]";
+        return Highlighting.stripHilights(ret);
+    }
 }
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java
index a811e40b8..b031e05ee 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java
@@ -64,6 +64,7 @@ public class DefineButtonTag extends CharacterTag implements ASMSource, BoundedT
     public int getCharacterID() {
         return buttonId;
     }
+    private long hdrSize;
 
     /**
      * Constructor
@@ -78,6 +79,7 @@ public class DefineButtonTag extends CharacterTag implements ASMSource, BoundedT
         buttonId = sis.readUI16();
         characters = sis.readBUTTONRECORDList(false);
         //actions = sis.readActionList();
+        hdrSize = sis.getPos();
         actionBytes = sis.readBytes(sis.available());
     }
 
@@ -117,7 +119,7 @@ public class DefineButtonTag extends CharacterTag implements ASMSource, BoundedT
      */
     @Override
     public String getASMSource(int version, boolean hex) {
-        return Action.actionsToString(getActions(version), null, version, hex);
+        return Action.actionsToString(0, getActions(version), null, version, hex, getPos() + hdrSize);
     }
 
     /**
@@ -149,7 +151,7 @@ public class DefineButtonTag extends CharacterTag implements ASMSource, BoundedT
             baos.write(actionBytes);
             ReReadableInputStream rri = new ReReadableInputStream(new ByteArrayInputStream(baos.toByteArray()));
             rri.setPos(prevLength);
-            return Action.removeNops(SWFInputStream.readActionList(rri, version, prevLength), version);
+            return Action.removeNops(0, SWFInputStream.readActionList(0, getPos() + hdrSize - prevLength, rri, version, prevLength, -1), version, getPos() + hdrSize);
         } catch (Exception ex) {
             Logger.getLogger(DoActionTag.class.getName()).log(Level.SEVERE, null, ex);
             return new ArrayList<Action>();
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java
index 36fea3365..ca727b3bc 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java
@@ -72,7 +72,7 @@ public class DoActionTag extends Tag implements ASMSource {
      */
     @Override
     public String getASMSource(int version, boolean hex) {
-        return Action.actionsToString(getActions(version), null, version, hex);
+        return Action.actionsToString(0, getActions(version), null, version, hex, getPos());
     }
 
     /**
@@ -111,7 +111,7 @@ public class DoActionTag extends Tag implements ASMSource {
             baos.write(actionBytes);
             ReReadableInputStream rri = new ReReadableInputStream(new ByteArrayInputStream(baos.toByteArray()));
             rri.setPos(prevLength);
-            return Action.removeNops(SWFInputStream.readActionList(rri, version, prevLength), version);
+            return Action.removeNops(0, SWFInputStream.readActionList(0, getPos() - prevLength, rri, version, prevLength, -1), version, getPos());
         } catch (Exception ex) {
             Logger.getLogger(DoActionTag.class.getName()).log(Level.SEVERE, null, ex);
             return new ArrayList<Action>();
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java
index 76edcb300..c2cb8563e 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java
@@ -95,7 +95,7 @@ public class DoInitActionTag extends CharacterTag implements ASMSource {
      */
     @Override
     public String getASMSource(int version, boolean hex) {
-        return Action.actionsToString(getActions(version), null, version, hex);
+        return Action.actionsToString(0, getActions(version), null, version, hex, getPos() + 2);
     }
 
     @Override
@@ -117,7 +117,7 @@ public class DoInitActionTag extends CharacterTag implements ASMSource {
             baos.write(actionBytes);
             ReReadableInputStream rri = new ReReadableInputStream(new ByteArrayInputStream(baos.toByteArray()));
             rri.setPos(prevLength);
-            return Action.removeNops(SWFInputStream.readActionList(rri, version, prevLength), version);
+            return Action.removeNops(0, SWFInputStream.readActionList(0, getPos() + 2 - prevLength, rri, version, prevLength, -1), version, getPos() + 2);
         } catch (Exception ex) {
             Logger.getLogger(DoActionTag.class.getName()).log(Level.SEVERE, null, ex);
             return new ArrayList<Action>();
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/base/ASMSource.java b/trunk/src/com/jpexs/decompiler/flash/tags/base/ASMSource.java
index e314a03d6..3e933d55d 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/base/ASMSource.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/base/ASMSource.java
@@ -61,4 +61,6 @@ public interface ASMSource {
     public byte[] getActionBytes();
 
     public void setActionBytes(byte actionBytes[]);
+
+    public long getPos();
 }
diff --git a/trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java b/trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java
index b2ed6bac7..07fa3fbe2 100644
--- a/trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java
+++ b/trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java
@@ -21,6 +21,8 @@ import com.jpexs.decompiler.flash.SWFInputStream;
 import com.jpexs.decompiler.flash.action.Action;
 import com.jpexs.decompiler.flash.tags.base.ASMSource;
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
@@ -33,6 +35,34 @@ import java.util.logging.Logger;
  */
 public class BUTTONCONDACTION implements ASMSource {
 
+    private long pos;
+
+    @Override
+    public long getPos() {
+        return pos;
+    }
+
+    public BUTTONCONDACTION(InputStream is, int version, long containerOffset) throws IOException {
+        SWFInputStream sis = new SWFInputStream(is, version);
+        pos = containerOffset;
+        int condActionSize = sis.readUI16();
+        isLast = condActionSize <= 0;
+        condIdleToOverDown = sis.readUB(1) == 1;
+        condOutDownToIdle = sis.readUB(1) == 1;
+        condOutDownToOverDown = sis.readUB(1) == 1;
+        condOverDownToOutDown = sis.readUB(1) == 1;
+        condOverDownToOverUp = sis.readUB(1) == 1;
+        condOverUpToOverDown = sis.readUB(1) == 1;
+        condOverUpToIddle = sis.readUB(1) == 1;
+        condIdleToOverUp = sis.readUB(1) == 1;
+        condKeyPress = (int) sis.readUB(7);
+        condOverDownToIddle = sis.readUB(1) == 1;
+        if (condActionSize <= 0) {
+            actionBytes = sis.readBytes(sis.available());
+        } else {
+            actionBytes = sis.readBytes(condActionSize - 4);
+        }
+    }
     /**
      * Is this BUTTONCONDACTION last in the list?
      */
@@ -112,7 +142,7 @@ public class BUTTONCONDACTION implements ASMSource {
      */
     @Override
     public String getASMSource(int version, boolean hex) {
-        return Action.actionsToString(getActions(version), null, version, hex);
+        return Action.actionsToString(0, getActions(version), null, version, hex, getPos() + 4);
     }
 
     /**
@@ -134,7 +164,7 @@ public class BUTTONCONDACTION implements ASMSource {
     @Override
     public List<Action> getActions(int version) {
         try {
-            return Action.removeNops(SWFInputStream.readActionList(new ReReadableInputStream(new ByteArrayInputStream(actionBytes)), version, 0), version);
+            return Action.removeNops(0, SWFInputStream.readActionList(0, getPos() + 4, new ReReadableInputStream(new ByteArrayInputStream(actionBytes)), version, 0, -1), version, getPos() + 4);
         } catch (Exception ex) {
             Logger.getLogger(BUTTONCONDACTION.class.getName()).log(Level.SEVERE, null, ex);
             return new ArrayList<Action>();
diff --git a/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java b/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java
index b6a36e71e..115842189 100644
--- a/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java
+++ b/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java
@@ -21,6 +21,8 @@ import com.jpexs.decompiler.flash.SWFInputStream;
 import com.jpexs.decompiler.flash.action.Action;
 import com.jpexs.decompiler.flash.tags.base.ASMSource;
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
@@ -33,6 +35,30 @@ import java.util.logging.Logger;
  */
 public class CLIPACTIONRECORD implements ASMSource {
 
+    private long pos;
+    private long hdrPos;
+
+    public CLIPACTIONRECORD(InputStream is, int version, long pos) throws IOException {
+        SWFInputStream sis = new SWFInputStream(is, version);
+        eventFlags = sis.readCLIPEVENTFLAGS();
+        if (eventFlags.isClear()) {
+            return;
+        }
+        long actionRecordSize = sis.readUI32();
+        if (eventFlags.clipEventKeyPress) {
+            keyCode = sis.readUI8();
+            actionRecordSize--;
+        }
+        hdrPos = sis.getPos();
+        actionBytes = sis.readBytes(actionRecordSize);
+        this.pos = pos;
+
+    }
+
+    @Override
+    public long getPos() {
+        return pos;
+    }
     /**
      * Events to which this handler applies
      */
@@ -79,7 +105,7 @@ public class CLIPACTIONRECORD implements ASMSource {
      */
     @Override
     public String getASMSource(int version, boolean hex) {
-        return Action.actionsToString(getActions(version), null, version, hex);
+        return Action.actionsToString(0, getActions(version), null, version, hex, getPos() + hdrPos);
     }
 
     /**
@@ -95,7 +121,7 @@ public class CLIPACTIONRECORD implements ASMSource {
     @Override
     public List<Action> getActions(int version) {
         try {
-            return Action.removeNops(SWFInputStream.readActionList(new ReReadableInputStream(new ByteArrayInputStream(actionBytes)), version, 0), version);
+            return Action.removeNops(0, SWFInputStream.readActionList(0, getPos() + hdrPos, new ReReadableInputStream(new ByteArrayInputStream(actionBytes)), version, 0, -1), version, getPos() + hdrPos);
         } catch (Exception ex) {
             Logger.getLogger(BUTTONCONDACTION.class.getName()).log(Level.SEVERE, null, ex);
             return new ArrayList<Action>();