diff --git a/Components/9918/Implementation/Draw.hpp b/Components/9918/Implementation/Draw.hpp
index 31a4a49f7..8c93addc1 100644
--- a/Components/9918/Implementation/Draw.hpp
+++ b/Components/9918/Implementation/Draw.hpp
@@ -122,6 +122,9 @@ void Base<personality>::draw_sprites(LineBuffer &buffer, int start, int end, int
 //	an OR mask up until I hit a non-CC sprite, at which point I composite everything out?
 //	I'm not immediately sure whether I can appropriately reuse sprite_buffer, but possibly?
 
+// TODO: on the Yamaha, record sprite collision location.
+// TODO: also, on the Yamaha bit 5 of register 8 affects sprite transparency. Check it out.
+
 // MARK: - TMS9918
 
 template <Personality personality>
@@ -341,6 +344,7 @@ void Base<personality>::draw_yamaha(LineBuffer &buffer, int start, int end) {
 		}
 	}
 
+	// TODO: in Graphics7, indicate fixed sprite colours.
 	draw_sprites<
 		SpriteMode::Mode2,
 		mode == ScreenMode::YamahaGraphics5 || mode == ScreenMode::YamahaGraphics6