making loads of improvement but still need better ROOT/tree design