Two new features to Naive-Baseline + bug fixes

added nesting depth and branching factor