diff --git a/ion/src/simulator/shared/events_keyboard.cpp b/ion/src/simulator/shared/events_keyboard.cpp
index 68cda4c51..87555116d 100644
--- a/ion/src/simulator/shared/events_keyboard.cpp
+++ b/ion/src/simulator/shared/events_keyboard.cpp
@@ -195,6 +195,7 @@ Event getPlatformEvent() {
       break;
     }
 #if !EPSILON_SDL_SCREEN_ONLY
+    // This works but it is selected right after. We should highlight on mouse movement?
     if (event.type == SDL_MOUSEBUTTONUP) {
       Simulator::Layout::unhighlightKey();
     }
diff --git a/ion/src/simulator/shared/layout.cpp b/ion/src/simulator/shared/layout.cpp
index 5d137258c..bbdf97d10 100644
--- a/ion/src/simulator/shared/layout.cpp
+++ b/ion/src/simulator/shared/layout.cpp
@@ -246,6 +246,7 @@ SDL_PixelFormat * sRgbaPixelFormat = SDL_AllocFormat(SDL_PIXELFORMAT_RGBA32);
 static constexpr size_t k_maxKeyLayoutSize = 130*130;
 static constexpr uint8_t k_blendingRatio = 0x44;
 
+// TODO: use a "native" image decompressor instead of LZ4
 void fillRGBABufferWithImage(Uint32 * buffer, const Image * img) {
   KDColor pixelBuffer[k_maxKeyLayoutSize];
   Ion::decompress(