diff --git a/src/ol/base/map.js b/src/ol/base/map.js
index 5420b2cc32..8f285aebd3 100644
--- a/src/ol/base/map.js
+++ b/src/ol/base/map.js
@@ -2,6 +2,10 @@
 // FIXME add change resolution by zoom step function
 // FIXME recheck layer/map projection compatability when projection changes
 // FIXME layer renderers should skip when they can't reproject
+// FIXME add rotation
+// FIXME add tilt and height?
+// FIXME split out renderer
+// FIXME add renderer selection strategy
 
 goog.provide('ol.Map');
 goog.provide('ol.MapProperty');
diff --git a/src/ol/control/control.js b/src/ol/control/control.js
index dba60d9f74..e0a8f2b37c 100644
--- a/src/ol/control/control.js
+++ b/src/ol/control/control.js
@@ -1,3 +1,7 @@
+// FIXME add keyboard pan
+// FIXME add snap-to-pixel pan strategy
+// FIXME add rotation control
+
 goog.provide('ol.Control');
 
 goog.require('ol.MapBrowserEvent');
diff --git a/src/ol/webgl/tilelayerrenderer.js b/src/ol/webgl/tilelayerrenderer.js
index 379a5e2347..225e39d074 100644
--- a/src/ol/webgl/tilelayerrenderer.js
+++ b/src/ol/webgl/tilelayerrenderer.js
@@ -1,6 +1,7 @@
 // FIXME large resolutions lead to too large framebuffers :-(
 // FIXME animated shaders! check in redraw
 // FIXME out-by-one error in texture alignment?
+// FIXME bad things happen when we go outside the zoom levels
 
 goog.provide('ol.webgl.TileLayerRenderer');
 goog.provide('ol.webgl.tilelayerrenderer.shader.Fragment');