Torch glitch fixed. Closes #5