Additions to light tree for efficiencies; turned off rcone scan by default