diff --git a/src/engine/controls/macrocontrol.cpp b/src/engine/controls/macrocontrol.cpp
index 8eab1e2adad6..eac00cd4f6c5 100644
--- a/src/engine/controls/macrocontrol.cpp
+++ b/src/engine/controls/macrocontrol.cpp
@@ -76,6 +76,8 @@ MacroControl::MacroControl(const QString& group, UserSettingsPointer pConfig, in
             &MacroControl::slotClear);
 }
 
+// FIXME(xeruf) Jumps while paused (e.g. via GotoAndStop) are not properly recorded
+// since this function is not called
 void MacroControl::process(const double dRate,
         mixxx::audio::FramePos currentPosition,
         const int iBufferSize) {
@@ -109,6 +111,8 @@ void MacroControl::process(const double dRate,
     }
 }
 
+// TODO(xeruf) Verify that all active Macros are fully unloaded and inactive
+// before a new track is loading - https://github.com/mixxxdj/mixxx/pull/2989#issuecomment-753465755
 void MacroControl::trackLoaded(TrackPointer pNewTrack) {
     if (isRecording()) {
         if (stopRecording()) {
@@ -160,6 +164,7 @@ MacroControl::Status MacroControl::getStatus() const {
     return Status(m_COStatus.get());
 }
 
+// TODO(xeruf) Waveform dimming when running
 void MacroControl::setStatus(Status status) {
     m_COStatus.forceSet(static_cast<int>(status));
     m_COPlay.set(status == Status::Playing ? 1 : 0);
diff --git a/src/track/track.cpp b/src/track/track.cpp
index 832d08b76419..cd7cb21ec97c 100644
--- a/src/track/track.cpp
+++ b/src/track/track.cpp
@@ -1299,6 +1299,8 @@ bool Track::isDirty() {
     if (m_bDirty) {
         return true;
     }
+    // FIXME(xeruf) this should be incorporated in the dirty state of the track itself
+    // but that is non-trivial, since, unlike other track properties, Macros are mutable
     for (const MacroPointer& pMacro : qAsConst(m_macros)) {
         if (pMacro->isDirty()) {
             return true;