diff --git a/README.md b/README.md
index e0db4a23..58caede0 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,10 @@ Yet Another way to use Windows VST2 plugins in Linux VST hosts.
 There are a few things that should be done before releasing this, including:
 
 - Fix implementation bugs:
+  - `VstTimeInfo` doesn't get passed to the plugin correctly in
+    `audioMasterGetTime`.
+  - Polish GUIs even further. There are some todos left in
+    `src/wine-host/editor.{h,cpp}`.
   - There are likely some minor issues left.
 - Add missing details if any to the architecture section.
 - Document what this has been tested on and what does or does not work.
diff --git a/src/wine-host/editor.cpp b/src/wine-host/editor.cpp
index fce596db..c9afcab2 100644
--- a/src/wine-host/editor.cpp
+++ b/src/wine-host/editor.cpp
@@ -66,8 +66,9 @@ void Editor::close() {
     // RAII will destroy the window and tiemrs for us
     win32_handle = std::nullopt;
 
-    // TODO: Do we need to do something on the X11 side or does the host do
-    //       everything for us?
+    // TODO: We might want to manually unmap the X11 window instead of having
+    //       the host do it. Right now the window editor window stays open for a
+    //       second when removing a plugin.
 }
 
 bool Editor::embed_into(const size_t parent_window_handle) {
diff --git a/src/wine-host/plugin-bridge.cpp b/src/wine-host/plugin-bridge.cpp
index ea0c8716..fafb6fe3 100644
--- a/src/wine-host/plugin-bridge.cpp
+++ b/src/wine-host/plugin-bridge.cpp
@@ -328,6 +328,7 @@ class HostCallbackDataConverter : DefaultDataConverter {
             case audioMasterGetTime:
                 // Return a pointer to the `VstTimeInfo` object written in the
                 // function above
+                // TODO: This is incorrect!
                 return reinterpret_cast<intptr_t>(&time);
                 break;
             default:
@@ -338,6 +339,7 @@ class HostCallbackDataConverter : DefaultDataConverter {
 
    private:
     AEffect* plugin;
+    // TODO: Clean up
     Editor& editor;
     VstTimeInfo& time_info;
 };