Code cleanup, added natural light settings.

Also added some better logging.