diff --git a/amt/raycaster.cpp b/amt/raycaster.cpp
index 4658c29..c440355 100644
--- a/amt/raycaster.cpp
+++ b/amt/raycaster.cpp
@@ -68,7 +68,6 @@ void Raycaster::position_camera(float player_x, float player_y) {
 
 void Raycaster::draw_pixel_buffer() {
   view_texture.update(pixels.to_raw_buf(), {(unsigned int)$width, (unsigned int)$height}, {0, 0});
-  // BUG: can I do this once and just update it?
   $window.draw(view_sprite);
 }
 
diff --git a/gui/dnd_loot.cpp b/gui/dnd_loot.cpp
index 4f37164..37239c1 100644
--- a/gui/dnd_loot.cpp
+++ b/gui/dnd_loot.cpp
@@ -185,7 +185,6 @@ namespace gui {
     }
   }
 
-  // BUG: should I do this in the commit_ functions or in the FSM?
   void DNDLoot::clear_grab() {
     $grab_source = std::nullopt;
     $grab_sprite = nullptr;
diff --git a/gui/fsm.cpp b/gui/fsm.cpp
index b455935..e742410 100644
--- a/gui/fsm.cpp
+++ b/gui/fsm.cpp
@@ -54,7 +54,7 @@ namespace gui {
     $loot_ui.init();
 
     // BUG: maybe this is a function on main_ui?
-    auto cell = $main_ui.$overlay_ui.$gui.cell_for("left");
+    auto cell = $main_ui.overlay_cell("left");
     $debug_ui.init(cell);
 
     $combat_ui.init();
diff --git a/gui/main_ui.cpp b/gui/main_ui.cpp
index 4581a2d..25689b6 100644
--- a/gui/main_ui.cpp
+++ b/gui/main_ui.cpp
@@ -53,6 +53,11 @@ namespace gui {
     $overlay_ui.show_sprite("middle", "blood_splatter");
   }
 
+
+  lel::Cell MainUI::overlay_cell(const std::string& name) {
+    return $overlay_ui.$gui.cell_for(name);
+  }
+
   bool MainUI::play_rotate() {
     bool done = $camera.play_rotate();
     $needs_render = !done;
diff --git a/gui/main_ui.hpp b/gui/main_ui.hpp
index 0d55604..4f75dd5 100644
--- a/gui/main_ui.hpp
+++ b/gui/main_ui.hpp
@@ -40,6 +40,7 @@ namespace gui {
     void init();
     void render();
     void dirty();
+    lel::Cell overlay_cell(const std::string& name);
 
     void health_low();
     void dead_entity(DinkyECS::Entity entity);
diff --git a/gui/overlay_ui.cpp b/gui/overlay_ui.cpp
index 760d262..6b189e7 100644
--- a/gui/overlay_ui.cpp
+++ b/gui/overlay_ui.cpp
@@ -64,6 +64,5 @@ namespace gui {
 
   void OverlayUI::update_level(GameLevel level) {
     $level = level;
-    // BUG: I think I have to redo the clickable
   }
 }
diff --git a/gui/ritual_ui.cpp b/gui/ritual_ui.cpp
index a788e42..6cad9c6 100644
--- a/gui/ritual_ui.cpp
+++ b/gui/ritual_ui.cpp
@@ -47,8 +47,6 @@ namespace gui {
       $ritual_ui = textures::get("ritual_crafting_area");
       $ritual_ui.sprite->setPosition($gui.get_position());
       $ritual_ui.sprite->setTextureRect($ritual_closed_rect);
-      // BUG: why am I doing this twice?
-      state(State::CLOSED);
       $ritual_anim = animation::load("ritual_blanket");
 
       auto open_close_toggle = $gui.entity("ritual_ui");
diff --git a/rituals.cpp b/rituals.cpp
index ab0b9ab..6fd7521 100644
--- a/rituals.cpp
+++ b/rituals.cpp
@@ -88,7 +88,6 @@ namespace ritual {
     return result;
   }
 
-  // BUG: maybe this should be called CraftingState instead?
   void CraftingState::dump() {
     ai::dump_script(script, start, plan.script);
   }