diff --git a/brest/pshops/pshop21/floor2 b/brest/pshops/pshop21/floor2
index 63e26bdaf..3eae0d16f 100644
--- a/brest/pshops/pshop21/floor2
+++ b/brest/pshops/pshop21/floor2
@@ -512,8 +512,8 @@ end
 arch woodwall_2_1_2
 x 3
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 3
@@ -730,8 +730,8 @@ end
 arch woodwall_2_1_2
 x 3
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 3
@@ -778,8 +778,8 @@ end
 arch woodwall_2_1_2
 x 4
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 4
@@ -1018,8 +1018,8 @@ end
 arch woodwall_2_1_2
 x 4
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 4
@@ -1066,8 +1066,8 @@ end
 arch woodwall_2_1_2
 x 5
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 5
@@ -1258,8 +1258,8 @@ end
 arch woodwall_2_1_2
 x 5
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 5
@@ -1291,8 +1291,8 @@ end
 arch woodwall_2_1_2
 x 6
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 6
@@ -1505,8 +1505,8 @@ end
 arch woodwall_2_1_2
 x 6
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 6
@@ -1570,8 +1570,8 @@ end
 arch woodwall_2_1_2
 x 7
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 7
@@ -1782,8 +1782,8 @@ end
 arch woodwall_2_1_2
 x 7
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 7
@@ -1815,8 +1815,8 @@ end
 arch woodwall_2_1_2
 x 8
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 8
@@ -2025,8 +2025,8 @@ end
 arch woodwall_2_1_2
 x 8
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 8
@@ -2073,8 +2073,8 @@ end
 arch woodwall_2_1_2
 x 9
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 9
@@ -2265,8 +2265,8 @@ end
 arch woodwall_2_1_2
 x 9
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 9
@@ -2298,8 +2298,8 @@ end
 arch woodwall_2_1_2
 x 10
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 10
@@ -2518,8 +2518,8 @@ end
 arch woodwall_2_1_2
 x 10
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 10
@@ -2559,8 +2559,8 @@ end
 arch woodwall_2_1_2
 x 11
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 11
@@ -2795,8 +2795,8 @@ end
 arch woodwall_2_1_2
 x 11
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 11
@@ -2855,8 +2855,8 @@ end
 arch woodwall_2_1_2
 x 12
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 12
@@ -3107,8 +3107,8 @@ end
 arch woodwall_2_1_2
 x 12
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 12
@@ -3140,8 +3140,8 @@ end
 arch woodwall_2_1_2
 x 13
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 13
@@ -3426,8 +3426,8 @@ end
 arch woodwall_2_1_2
 x 13
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 13
@@ -3478,8 +3478,8 @@ end
 arch woodwall_2_1_2
 x 14
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 14
@@ -3758,8 +3758,8 @@ end
 arch woodwall_2_1_2
 x 14
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 14
@@ -3816,8 +3816,8 @@ end
 arch woodwall_2_1_2
 x 15
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 15
@@ -4124,8 +4124,8 @@ end
 arch woodwall_2_1_2
 x 15
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 15
@@ -4168,8 +4168,8 @@ end
 arch woodwall_2_1_2
 x 16
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 16
@@ -4434,8 +4434,8 @@ end
 arch woodwall_2_1_2
 x 16
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 16
@@ -4467,8 +4467,8 @@ end
 arch woodwall_2_1_2
 x 17
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 17
@@ -4753,8 +4753,8 @@ end
 arch woodwall_2_1_2
 x 17
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 17
@@ -4800,8 +4800,8 @@ end
 arch woodwall_2_1_2
 x 18
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 18
@@ -5072,8 +5072,8 @@ end
 arch woodwall_2_1_2
 x 18
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 18
@@ -5119,8 +5119,8 @@ end
 arch woodwall_2_1_2
 x 19
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 19
@@ -5355,8 +5355,8 @@ end
 arch woodwall_2_1_2
 x 19
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 19
@@ -5388,8 +5388,8 @@ end
 arch woodwall_2_1_2
 x 20
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 20
@@ -5608,8 +5608,8 @@ end
 arch woodwall_2_1_2
 x 20
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 20
@@ -5655,8 +5655,8 @@ end
 arch woodwall_2_1_2
 x 21
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 21
@@ -5847,8 +5847,8 @@ end
 arch woodwall_2_1_2
 x 21
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 21
@@ -5894,8 +5894,8 @@ end
 arch woodwall_2_1_2
 x 22
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 22
@@ -6104,8 +6104,8 @@ end
 arch woodwall_2_1_2
 x 22
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 22
@@ -6137,8 +6137,8 @@ end
 arch woodwall_2_1_2
 x 23
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 23
@@ -6352,8 +6352,8 @@ end
 arch woodwall_2_1_2
 x 23
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 23
@@ -6399,8 +6399,8 @@ end
 arch woodwall_2_1_2
 x 24
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 24
@@ -6609,8 +6609,8 @@ end
 arch woodwall_2_1_2
 x 24
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 24
@@ -6656,8 +6656,8 @@ end
 arch woodwall_2_1_2
 x 25
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 25
@@ -6898,8 +6898,8 @@ end
 arch woodwall_2_1_2
 x 25
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 25
@@ -6931,8 +6931,8 @@ end
 arch woodwall_2_1_2
 x 26
 y 2
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch dungeon_magic
 x 26
@@ -7153,8 +7153,8 @@ end
 arch woodwall_2_1_2
 x 26
 y 20
-no_pick 0
 move_block 0
+no_pick 0
 end
 arch blocked
 x 26
@@ -8142,8 +8142,8 @@ end
 arch barrel
 x 31
 y 13
-no_pick 1
 move_block 0
+no_pick 1
 can_roll 0
 end
 arch woodfloor
@@ -8163,8 +8163,8 @@ end
 arch barrel
 x 31
 y 14
-no_pick 1
 move_block 0
+no_pick 1
 can_roll 0
 end
 arch blocked
diff --git a/templates/guild/basement b/templates/guild/basement
index 1d5b8ce45..12119f5d1 100644
--- a/templates/guild/basement
+++ b/templates/guild/basement
@@ -5,6 +5,8 @@ height 25
 msg
 Creator: CF Java Map Editor
 Date:    6/15/2003
+Map finised by:  Alestan jehloq@yahoo.com
+Date:     8/27/2007
 endmsg
 end
 arch woodfloor