diff --git a/content/system/house/house.gd b/content/system/house/house.gd
index d957a3b..b4f8336 100644
--- a/content/system/house/house.gd
+++ b/content/system/house/house.gd
@@ -97,10 +97,16 @@ func delete_room(room_name):
 	if editing_room == room:
 		editing_room = null
 
-	room.get_parent().remove_child(room)
 	room.queue_free()
 	await room.tree_exited
 
+	var store_room = Store.house.get_room(room_name)
+
+	if store_room != null:
+		Store.house.rooms.erase(store_room)
+
+	Store.house.save_local()
+
 func is_editiong(room_name):
 	return editing_room != null && editing_room.name == room_name
 
@@ -221,15 +227,24 @@ func fix_reference():
 
 func save_reference():
 	if fixing_reference:
+		for room in get_rooms(0):
+			room.editable = true
+
 		var align_transform = align_reference.global_transform
-		transform = align_reference.get_new_transform(transform)
+		transform = align_reference.get_new_transform()
 		align_reference.global_transform = align_transform
 
+		align_reference.update_store()
+
+		for room in get_rooms(0):
+			room.editable = false
+
+		save_all_entities()
+
 	align_reference.disabled = true
 	align_reference.visible = false
 	align_reference.update_initial_positions()
 
-	align_reference.update_store()
 	Store.house.save_local()
 
 func save_all_entities():
diff --git a/content/system/house/room/states/edit.gd b/content/system/house/room/states/edit.gd
index edb3c97..e17a000 100644
--- a/content/system/house/room/states/edit.gd
+++ b/content/system/house/room/states/edit.gd
@@ -19,13 +19,13 @@ func _on_enter():
 	var corners = room_store.corners
 	
 	if corners.size() > 0:
-		add_floor_corner(Vector3(corners[0].x, 0, corners[0].y))
-		add_height_corner(Vector3(corners[0].x, 0, corners[0].y))
+		add_floor_corner(room.to_local(Vector3(corners[0].x, 0, corners[0].y)))
+		add_height_corner(room.to_local(Vector3(corners[0].x, 0, corners[0].y)))
 		room.room_ceiling.position.y = room_store.height
-		height_edge.align_to_corners(floor_corner.global_position, height_corner.global_position)
+		height_edge.align_to_corners(floor_corner.position, floor_corner.position + Vector3.UP * room.room_ceiling.position.y)
 
 		for i in range(1, corners.size()):
-			add_corner(Vector3(corners[i].x, 0, corners[i].y))
+			add_corner(room.to_local(Vector3(corners[i].x, 0, corners[i].y)))
 
 	room.room_ceiling.get_node("CollisionShape3D").disabled = (floor_corner == null && height_corner == null)
 	room.room_floor.get_node("CollisionShape3D").disabled = false
@@ -164,7 +164,7 @@ func add_height_corner(position: Vector3):
 			return
 
 		room.room_ceiling.position.y = new_position.y
-		height_edge.align_to_corners(floor_corner.global_position, height_corner.global_position)
+		height_edge.align_to_corners(floor_corner.position, floor_corner.position + Vector3.UP * room.room_ceiling.position.y)
 		
 	)
 
@@ -266,15 +266,15 @@ func add_edge(from_pos: Vector3, to_pos: Vector3, index: int = -1):
 func update_store():
 	var store_room = Store.house.get_room(room.name)
 
+	if store_room == null:
+		return
+
 	var corners = []
 
 	for corner in room.wall_corners.get_children():
-		corners.append(Vector2(corner.position.x, corner.position.z))
+		corners.append(Vector2(corner.global_position.x, corner.global_position.z))
 
 	store_room.corners = corners
 	store_room.height = room.room_ceiling.position.y
 
-	if corners.size() < 3:
-		House.body.delete_room(room.name)
-
 	Store.house.save_local()
diff --git a/lib/stores/house.gd b/lib/stores/house.gd
index d06f9a4..9726c65 100644
--- a/lib/stores/house.gd
+++ b/lib/stores/house.gd
@@ -21,7 +21,8 @@ func _init():
 	_save_path = "user://house.json"
 
 func clear():
-	pass
+	rooms = []
+	entities = []
 
 func get_room(name):
 	for room in rooms: