diff --git a/gmap.py b/gmap.py
index da18aa0..8510732 100755
--- a/gmap.py
+++ b/gmap.py
@@ -52,7 +52,7 @@ def main():
     parser.add_option("--lighting", dest="lighting", help="Renders shadows using light data from each chunk.", action="store_true")
     parser.add_option("--night", dest="night", help="Renders shadows using light data from each chunk, as if it were night. Implies --lighting.", action="store_true")
     parser.add_option("--spawn", dest="spawn", help="Renders shadows using light data from each chunk, as if it were night, while also highlighting areas that are dark enough to spawn mobs. Implies --lighting and --night.", action="store_true")
-    parser.add_option("--imgformat", dest="imgformat", help="The image output format to use. Currently supported: png(default), jpg. NOTE: png will always be used as the intermediate image format.")
+    parser.add_option("--imgformat", dest="imgformat", help="The image output format to use. Currently supported: png(default), jpg.")
     parser.add_option("--optimize-img", dest="optimizeimg", help="If using png, perform image file size optimizations on the output. Specify 1 for pngcrush, 2 for pngcrush+optipng+advdef. This may double (or more) render times, but will produce up to 30% smaller images. NOTE: requires corresponding programs in $PATH or %PATH%")
     parser.add_option("-q", "--quiet", dest="quiet", action="count", default=0, help="Print less output. You can specify this option multiple times.")
     parser.add_option("-v", "--verbose", dest="verbose", action="count", default=0, help="Print more output. You can specify this option multiple times.")
@@ -137,8 +137,8 @@ def main():
     w.go(options.procs)
 
     # Now generate the tiles
-    # TODO chunklist, render type (night, lighting, spawn)
-    q = quadtree.QuadtreeGen(w, destdir, depth=options.zoom, imgformat=imgformat, optimizeimg=optimizeimg)
+    # TODO chunklist
+    q = quadtree.QuadtreeGen(w, destdir, depth=options.zoom, imgformat=imgformat, optimizeimg=optimizeimg, lighting=options.lighting, night=options.night, spawn=options.spawn)
     q.write_html(options.skipjs)
     q.go(options.procs)
 
diff --git a/quadtree.py b/quadtree.py
index 34d3081..78dcffb 100644
--- a/quadtree.py
+++ b/quadtree.py
@@ -82,7 +82,7 @@ def catch_keyboardinterrupt(func):
     return newfunc
 
 class QuadtreeGen(object):
-    def __init__(self, worldobj, destdir, depth=None, imgformat=None, optimizeimg=None):
+    def __init__(self, worldobj, destdir, depth=None, imgformat=None, optimizeimg=None, lighting=False, night=False, spawn=False):
         """Generates a quadtree from the world given into the
         given dest directory
 
@@ -96,10 +96,9 @@ class QuadtreeGen(object):
         self.imgformat = imgformat
         self.optimizeimg = optimizeimg
         
-        # TODO placeholders (use config!)
-        self.lighting = False
-        self.night = False
-        self.spawn = False
+        self.lighting = lighting
+        self.night = night
+        self.spawn = spawn
 
         # Make the destination dir
         if not os.path.exists(destdir):
@@ -652,7 +651,7 @@ def render_worldtile(quadtree, chunks, colstart, colend, rowstart, rowend, path)
         ypos = -96 + (row-rowstart)*96
 
         # draw the chunk!
-        # TODO cave, queue arguments
+        # TODO POI queue
         chunk.render_to_image((chunkx, chunky), tileimg, (xpos, ypos), quadtree, False, None)
 
     # Save them