cleaned up packages a bit and tweaked torch light