Made the torch a bit better. More tweaks