diff --git a/game/rooms/room08/room08.tscn b/game/rooms/room08/room08.tscn
index 9727007f..6fccf09e 100644
--- a/game/rooms/room08/room08.tscn
+++ b/game/rooms/room08/room08.tscn
@@ -259,6 +259,9 @@ the door opening etc.
 Unlocking the puzzle disables (and
 hides) the locked button, showing the
 unlocked graphic underneath."
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
 [node name="Hotspots" type="Node2D" parent="."]
 
diff --git a/game/rooms/room09/esc/closet_right.esc b/game/rooms/room09/esc/closet_right.esc
index fc243e70..9e2dff47 100755
--- a/game/rooms/room09/esc/closet_right.esc
+++ b/game/rooms/room09/esc/closet_right.esc
@@ -76,4 +76,4 @@ set_state r9_closet_right close_door
 set_global right_closet_open false
 # Decrement the counter of closets open (used to determine when to show
 # the magic bottle)
-dec_global open_closets 1
\ No newline at end of file
+dec_global open_closets 1
diff --git a/game/rooms/room09/esc/room09.esc b/game/rooms/room09/esc/room09.esc
index 95742b19..b5b4f499 100644
--- a/game/rooms/room09/esc/room09.esc
+++ b/game/rooms/room09/esc/room09.esc
@@ -8,6 +8,8 @@ set_active r9_bottle_middle false
 set_active r9_bottle_right false
 set_state r9_stand remove_bottle
 
+set_active r9_bottle false
+
 # Run all the animations to make sure the closet doors are closed
 set_state r9_closet_left close_door
 set_state r9_closet_middle close_door
diff --git a/game/rooms/room09/room09.tscn b/game/rooms/room09/room09.tscn
index 33e73c5b..c1303daa 100644
--- a/game/rooms/room09/room09.tscn
+++ b/game/rooms/room09/room09.tscn
@@ -687,3 +687,11 @@ position = Vector2( 76.7617, 437.649 )
 script = ExtResource( 12 )
 global_id = "r9_player_start"
 is_start_location = true
+
+[node name="bottle_inventory" parent="." instance=ExtResource( 11 )]
+position = Vector2( 490.648, 92.016 )
+dont_apply_terrain_scaling = true
+
+[node name="Position2D" type="Position2D" parent="bottle_inventory"]
+position = Vector2( -11, 284 )
+script = ExtResource( 12 )
diff --git a/game/rooms/room10/room10.tscn b/game/rooms/room10/room10.tscn
index a0085ad6..2df21cb5 100644
--- a/game/rooms/room10/room10.tscn
+++ b/game/rooms/room10/room10.tscn
@@ -35,7 +35,7 @@ __meta__ = {
 "_editor_description_": ""
 }
 
-[node name="Hotspots" type="Node" parent="."]
+[node name="Hotspots" type="Node2D" parent="."]
 
 [node name="r_door" type="Area2D" parent="Hotspots"]
 script = ExtResource( 2 )
@@ -72,6 +72,7 @@ script = ExtResource( 5 )
 
 [node name="button_stop_bg_music" type="Area2D" parent="Hotspots"]
 pause_mode = 1
+z_index = 1
 script = ExtResource( 7 )
 global_id = "r10_btn_stop_bg_music"
 esc_script = "res://game/rooms/room10/esc/button_stop_bg_music.esc"
@@ -96,6 +97,9 @@ text = "Stop
 background
 music"
 align = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/button_stop_bg_music"]
 position = Vector2( 137.7, 41.1 )
@@ -103,6 +107,7 @@ polygon = PoolVector2Array( 358, 212, 460, 220, 455, 319, 351, 315 )
 
 [node name="button_play_bg_music" type="Area2D" parent="Hotspots"]
 pause_mode = 1
+z_index = 1
 script = ExtResource( 7 )
 global_id = "r10_btn_play_bg_music"
 esc_script = "res://game/rooms/room10/esc/button_play_bg_music.esc"
@@ -135,6 +140,7 @@ polygon = PoolVector2Array( 356, 243, 419, 210, 463, 293, 402, 327 )
 
 [node name="button_accept_input" type="Area2D" parent="Hotspots"]
 pause_mode = 1
+z_index = 1
 script = ExtResource( 7 )
 global_id = "test_accept_input"
 esc_script = "res://game/rooms/room10/esc/button_accept_input_test.esc"
@@ -166,6 +172,7 @@ polygon = PoolVector2Array( 787, 336, 871, 348, 856, 481, 773, 471 )
 
 [node name="button_slide" type="Area2D" parent="Hotspots"]
 pause_mode = 1
+z_index = 1
 script = ExtResource( 7 )
 global_id = "button_slide"
 esc_script = "res://game/rooms/room10/esc/button_slide.esc"
@@ -190,6 +197,9 @@ custom_colors/font_color = Color( 0, 0, 0, 1 )
 text = "Test 
 Slide"
 align = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/button_slide"]
 position = Vector2( 87, -140 )
@@ -197,6 +207,7 @@ polygon = PoolVector2Array( 774, 378, 842, 378, 843, 472, 774, 471 )
 
 [node name="button_turn_to" type="Area2D" parent="Hotspots"]
 pause_mode = 1
+z_index = 1
 script = ExtResource( 7 )
 global_id = "button_turn_to"
 esc_script = "res://game/rooms/room10/esc/button_turn_to.esc"
@@ -227,6 +238,7 @@ polygon = PoolVector2Array( 976, 347, 1046, 347, 1047, 440, 976, 441 )
 
 [node name="button_play_sound" type="Area2D" parent="Hotspots"]
 pause_mode = 1
+z_index = 1
 script = ExtResource( 7 )
 global_id = "r10_btn_play_snd"
 esc_script = "res://game/rooms/room10/esc/button_play_snd.esc"
@@ -282,6 +294,9 @@ margin_bottom = 40.0
 mouse_filter = 2
 texture = ExtResource( 10 )
 script = ExtResource( 11 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
 [node name="room_label" type="Label" parent="ESCBackground"]
 margin_right = 92.0
@@ -292,7 +307,7 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="Room_overview" type="Node" parent="."]
+[node name="Room_overview" type="Node2D" parent="."]
 
 [node name="Polygon2D" type="Polygon2D" parent="Room_overview"]
 position = Vector2( 3, -138 )
@@ -319,3 +334,6 @@ boundaries. Turn_to rotates the player
 Accept_input stops the player from 
 interracting with the game while an 
 ESCscript is in progress."
+__meta__ = {
+"_edit_use_anchors_": false
+}