diff --git a/lib/pinhole.rb b/lib/pinhole.rb
index d12f7f9..f1fbbb7 100644
--- a/lib/pinhole.rb
+++ b/lib/pinhole.rb
@@ -1,5 +1,6 @@
 require 'gir_ffi'
 
+# FIXME: Make gir_ffi load everything as global.
 GlobalGtk = FFI::DynamicLibrary.open(
   FFI.map_library_name('gtk-x11-2.0'),
   FFI::DynamicLibrary::RTLD_LAZY | FFI::DynamicLibrary::RTLD_GLOBAL)
diff --git a/lib/pinhole/image.rb b/lib/pinhole/image.rb
index 6ce5bd4..33d8219 100644
--- a/lib/pinhole/image.rb
+++ b/lib/pinhole/image.rb
@@ -1,6 +1,7 @@
 module Pinhole
   class Image < Gtk::ScrolledWindow
 
+    # FIXME: Create appropriate Color constructor.
     #COLOR_BLACK = Gdk::Color.new(0, 0, 0)
 
     def initialize
@@ -44,6 +45,7 @@ def update_pixbuf
     public
 
     def fullscreen
+      # FIXME: Restore once black is defined.
       #@eventbox.modify_bg Gtk::STATE_NORMAL, COLOR_BLACK
       @fullscreen = true
       update_scrollbar_policy
diff --git a/lib/pinhole/mainwindow.rb b/lib/pinhole/mainwindow.rb
index 068bbca..ea16707 100644
--- a/lib/pinhole/mainwindow.rb
+++ b/lib/pinhole/mainwindow.rb
@@ -55,12 +55,14 @@ def run
     def setup_ui
       @builder = Gtk::Builder.new
       @builder.add_from_file Pinhole.path "data", "pinhole.ui"
+      # FIXME: Add override to simplify this method call.
       @builder.connect_signals_full Proc.new { |b,o,sn,hn,co,f,ud|
 	sn.gsub! /_/, '-'
 	GObject.signal_connect cast_object_pointer(o), sn, self.method(hn)
       }, nil
     end
 
+    # FIXME: Make part of gir_ffi.
     def cast_object_pointer optr
       tp = GObject.type_from_instance_pointer optr
       gir = GirFFI::IRepository.default