bugs fix, new floorplan