Merge. Started working on light flicker. The light pointers for the torches are weird...