Added torches and lots of other changes.