Rework lighting system, add torch block.