few minor changes torches correctly identified