diff --git a/data/altres.gif b/data/altres.gif
index 903a54b..79f7e93 100644
Binary files a/data/altres.gif and b/data/altres.gif differ
diff --git a/data/rooms/02.txt b/data/rooms/02.txt
index 0831a06..5e7be10 100644
--- a/data/rooms/02.txt
+++ b/data/rooms/02.txt
@@ -51,7 +51,7 @@ actor{
 }
 
 actor{
-    name: BOOSTER
+    name: B-LIVE
     bmp: objectes.gif
     bmp-rect: 114 78 15 18
     bmp-offset: -8 22
diff --git a/data/rooms/19.txt b/data/rooms/19.txt
index a3d8282..1baf9dc 100644
--- a/data/rooms/19.txt
+++ b/data/rooms/19.txt
@@ -3,9 +3,9 @@ height: 1
 door-height-yp: 0
 door-height-yn: 0
 color: YELLOW
-floor-texture: 0
-wall-texture: 0
-door-texture: 0
+floor-texture: 1
+wall-texture: 13
+door-texture: 7
 under-door-texture: 0
 exit-yp: 18
 exit-yn: 20
diff --git a/data/rooms/22.txt b/data/rooms/22.txt
index 3d15989..331af72 100644
--- a/data/rooms/22.txt
+++ b/data/rooms/22.txt
@@ -9,3 +9,73 @@ door-texture: 7
 under-door-texture: 13
 exit-xp: 21
 exit-yp: 23
+
+actor{
+    name: PLATF-00
+    bmp: caixes.gif
+    bmp-rect: 96 160 32 32
+    bmp-offset: 0 32
+    pos: 8 8 0
+    size: 8 8 8
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: PLATF-01
+    bmp: caixes.gif
+    bmp-rect: 96 160 32 32
+    bmp-offset: 0 32
+    pos: 8 48 0
+    size: 8 8 8
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: PLATF-02
+    bmp: caixes.gif
+    bmp-rect: 96 160 32 32
+    bmp-offset: 0 32
+    pos: 48 8 0
+    size: 8 8 8
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: PLATF-03
+    bmp: caixes.gif
+    bmp-rect: 96 160 32 32
+    bmp-offset: 0 32
+    pos: 48 48 0
+    size: 8 8 8
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: ROOMBA-00
+    bmp: caixes.gif
+    bmp-rect: 160 0 32 32
+    bmp-offset: 0 34
+    pos: 16 16 0
+    size: 8 8 2
+    orient: YN 
+    flags: REACTIVE MOVING DEADLY 
+    react-mask: XP XN YP YN ZP ZN 
+    movement: RANDV
+}
+
+actor{
+    name: ROOMBA-01
+    bmp: caixes.gif
+    bmp-rect: 160 0 32 32
+    bmp-offset: 0 34
+    pos: 32 32 0
+    size: 8 8 2
+    orient: XN 
+    flags: REACTIVE MOVING DEADLY 
+    react-mask: XP XN YP YN ZP ZN 
+    movement: RANDV
+}
diff --git a/data/rooms/23.txt b/data/rooms/23.txt
index 531a6d0..30c24d6 100644
--- a/data/rooms/23.txt
+++ b/data/rooms/23.txt
@@ -1,9 +1,175 @@
 width: 2
-height: 2
+height: 3
 door-height-yn: 0
 color: WHITE
-floor-texture: 0
-wall-texture: 0
-door-texture: 0
+floor-texture: 1
+wall-texture: 13
+door-texture: 7
 under-door-texture: 0
 exit-yn: 22
+
+actor{
+    name: ABAD
+    bmp: abad.gif
+    bmp-rect: 0 0 20 33
+    bmp-offset: -6 39
+    pos: 32 9 2
+    size: 8 8 8
+    orient: YP 
+    anim-wait: 1
+    flags: PUSHABLE REACTIVE ORIENTABLE DEADLY GRAVITY 
+    react-mask: XP XN YP YN ZP ZN 
+    movement: CCW
+}
+
+actor{
+    name: B-JUMP
+    bmp: objectes.gif
+    bmp-rect: 114 78 15 18
+    bmp-offset: -8 22
+    pos: 8 48 12
+    size: 4 4 4
+    anim-cycle: SEQ
+    anim-wait: 2
+    flags: ANIMATED SPECIAL 
+    movement: CW
+}
+
+actor{
+    name: BATMAN
+    bmp: batman.gif
+    bmp-rect: 0 0 21 32
+    bmp-offset: -6 39
+    pos: 40 8 2
+    size: 8 8 8
+    orient: YP 
+    anim-wait: 1
+    flags: PUSHABLE REACTIVE ORIENTABLE DEADLY GRAVITY 
+    react-mask: XP XN YP YN ZP ZN 
+    movement: CCW
+}
+
+actor{
+    name: FINISH-00
+    bmp: altres.gif
+    bmp-rect: 133 80 24 11
+    bmp-offset: 0 11
+    pos: 40 48 0
+    size: 8 8 0
+    flags: PUSHABLE 
+    movement: CW
+}
+
+actor{
+    name: FINISH-01
+    bmp: altres.gif
+    bmp-rect: 133 80 24 11
+    bmp-offset: 0 11
+    pos: 32 48 0
+    size: 8 8 0
+    flags: PUSHABLE 
+    movement: CW
+}
+
+actor{
+    name: FINISH-02
+    bmp: altres.gif
+    bmp-rect: 133 80 24 11
+    bmp-offset: 0 11
+    pos: 24 48 0
+    size: 8 8 0
+    flags: PUSHABLE 
+    movement: CW
+}
+
+actor{
+    name: FINISH-03
+    bmp: altres.gif
+    bmp-rect: 133 80 24 11
+    bmp-offset: 0 11
+    pos: 16 48 0
+    size: 8 8 0
+    flags: PUSHABLE 
+    movement: CW
+}
+
+actor{
+    name: FINISH-04
+    bmp: altres.gif
+    bmp-rect: 133 80 24 11
+    bmp-offset: 0 11
+    pos: 48 48 0
+    size: 8 8 0
+    flags: PUSHABLE 
+    movement: CW
+}
+
+actor{
+    name: PLATF-00
+    bmp: caixes.gif
+    bmp-rect: 96 160 32 32
+    bmp-offset: 0 32
+    pos: 8 48 0
+    size: 8 8 8
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: PLATF-01
+    bmp: caixes.gif
+    bmp-rect: 96 160 32 32
+    bmp-offset: 0 32
+    pos: 8 40 0
+    size: 8 8 8
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: PLATH-00
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 8 56 0
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: PLATH-01
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 8 48 8
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: ROOMBA-00
+    bmp: caixes.gif
+    bmp-rect: 160 0 32 32
+    bmp-offset: 0 34
+    pos: 32 8 0
+    size: 8 8 2
+    orient: YP 
+    flags: REACTIVE MOVING DEADLY 
+    react-mask: XP XN YP YN ZP ZN 
+    movement: RANDV
+}
+
+actor{
+    name: ROOMBA-01
+    bmp: caixes.gif
+    bmp-rect: 160 0 32 32
+    bmp-offset: 0 34
+    pos: 40 8 0
+    size: 8 8 2
+    orient: YP 
+    flags: REACTIVE MOVING DEADLY 
+    react-mask: XP XN YP YN ZP ZN 
+    movement: RANDV
+}
diff --git a/source/actor.cpp b/source/actor.cpp
index 5846f4a..dcb46af 100644
--- a/source/actor.cpp
+++ b/source/actor.cpp
@@ -769,10 +769,10 @@ namespace actor
                     case 1: act->mov_push=PUSH_XN; break;
                     case 2: act->mov_push=PUSH_YN; break;
                     case 3: act->mov_push=PUSH_XP; break;
-                    case 4: act->mov_push=PUSH_YP; act->mov_push=PUSH_XN; break;
-                    case 5: act->mov_push=PUSH_XN; act->mov_push=PUSH_YN; break;
-                    case 6: act->mov_push=PUSH_YN; act->mov_push=PUSH_XP; break;
-                    case 7: act->mov_push=PUSH_XP; act->mov_push=PUSH_YP; break;
+                    case 4: act->mov_push=PUSH_YP; act->mov_push|=PUSH_XN; break;
+                    case 5: act->mov_push=PUSH_XN; act->mov_push|=PUSH_YN; break;
+                    case 6: act->mov_push=PUSH_YN; act->mov_push|=PUSH_XP; break;
+                    case 7: act->mov_push=PUSH_XP; act->mov_push|=PUSH_YP; break;
                 }
                 break;
             case MOV_HUNT: